Merge branch 'gerrit'

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 988eae6435889e7892a0f5734d55aee8bfad49ba..deb21a6fc2ace4df2fcc2fd55852d0ce7c56f121 100644 (file)
--- a/command.c
+++ b/command.c
@@ -204,16 +204,9 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
                break;
        case SENDER_ADD:
        case SENDER_DELETE:
-               if (argc != 4 && argc != 5)
-                       return -E_COMMAND_SYNTAX;
-               if (!inet_pton(AF_INET, argv[3], &scd->addr))
+               if (argc != 4 || parse_url(argv[3], scd->host,
+                               sizeof(scd->host), &scd->port) == NULL)
                        return -E_COMMAND_SYNTAX;
-               scd->port = -1;
-               if (argc == 5) {
-                       scd->port = atoi(argv[4]);
-                       if (scd->port < 0 || scd->port > 65535)
-                               return -E_COMMAND_SYNTAX;
-               }
                break;
        default:
                return -E_COMMAND_SYNTAX;