Changes in uspace/app/download/main.c [9713b0b:fab2746] in mainline

File:

• uspace/app/download/main.c (modified) (11 diffs)

uspace/app/download/main.c

@@ -57 +57 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: download [-o <outfile>] <url>\n");
-        fprintf(stderr, "  Without -o, data will be written to stdout, so you may want\n");
+        fprintf(stderr, "Usage: download <url>\n");
+        fprintf(stderr, "  This will write the data to stdout, so you may want\n");
         fprintf(stderr, "  to redirect the output, e.g.\n");
         fprintf(stderr, "\n");
@@ -66 +66 @@
 int main(int argc, char *argv[])
 {
-        int i;
-        char *ofname = NULL;
-        FILE *ofile = NULL;
-        size_t buf_size = 4096;
-        void *buf = NULL;
-        uri_t *uri = NULL;
-        http_t *http = NULL;
-        int rc;
-
-        if (argc < 2) {
+        if (argc != 2) {
                 syntax_print();
-                rc = EINVAL;
-                goto error;
-        }
-        
-        i = 1;
-        
-        if (str_cmp(argv[i], "-o") == 0) {
-                ++i;
-                if (argc < i + 1) {
-                        syntax_print();
-                        rc = EINVAL;
-                        goto error;
-                }
-                
-                ofname = argv[i++];
-                ofile = fopen(ofname, "wb");
-                if (ofile == NULL) {
-                        fprintf(stderr, "Error creating '%s'.\n", ofname);
-                        rc = EINVAL;
-                        goto error;
-                }
-        }
-        
-        if (argc != i + 1) {
-                syntax_print();
-                rc = EINVAL;
-                goto error;
-        }
-        
-        uri = uri_parse(argv[i]);
+                return 2;
+        }
+        
+        uri_t *uri = uri_parse(argv[1]);
         if (uri == NULL) {
                 fprintf(stderr, "Failed parsing URI\n");
-                rc = EINVAL;
-                goto error;
+                return 2;
         }
         
         if (!uri_validate(uri)) {
                 fprintf(stderr, "The URI is invalid\n");
-                rc = EINVAL;
-                goto error;
+                return 2;
         }
         
@@ -123 +86 @@
         if (str_cmp(uri->scheme, "http") != 0) {
                 fprintf(stderr, "Only http scheme is supported at the moment\n");
-                rc = EINVAL;
-                goto error;
+                return 2;
         }
         
         if (uri->host == NULL) {
                 fprintf(stderr, "host not set\n");
-                rc = EINVAL;
-                goto error;
+                return 2;
         }
         
         uint16_t port = 80;
         if (uri->port != NULL) {
-                rc = str_uint16_t(uri->port, NULL, 10, true, &port);
+                int rc = str_uint16_t(uri->port, NULL, 10, true, &port);
                 if (rc != EOK) {
                         fprintf(stderr, "Invalid port number: %s\n", uri->port);
-                        rc = EINVAL;
-                        goto error;
+                        return 2;
                 }
         }
@@ -151 +111 @@
                 if (server_path == NULL) {
                         fprintf(stderr, "Failed allocating path\n");
-                        rc = ENOMEM;
-                        goto error;
-                }
-        } else {
-                rc = asprintf(&server_path, "%s?%s", path, uri->query);
+                        uri_destroy(uri);
+                        return 3;
+                }
+        }
+        else {
+                int rc = asprintf(&server_path, "%s?%s", path, uri->query);
                 if (rc < 0) {
                         fprintf(stderr, "Failed allocating path\n");
-                        rc = ENOMEM;
-                        goto error;
+                        uri_destroy(uri);
+                        return 3;
                 }
         }
@@ -167 +128 @@
         if (req == NULL) {
                 fprintf(stderr, "Failed creating request\n");
-                rc = ENOMEM;
-                goto error;
-        }
-        
-        rc = http_headers_append(&req->headers, "Host", uri->host);
+                uri_destroy(uri);
+                return 3;
+        }
+        
+        int rc = http_headers_append(&req->headers, "Host", uri->host);
         if (rc != EOK) {
                 fprintf(stderr, "Failed setting Host header: %s\n", str_error(rc));
-                goto error;
+                uri_destroy(uri);
+                return rc;
         }
         
@@ -180 +142 @@
         if (rc != EOK) {
                 fprintf(stderr, "Failed creating User-Agent header: %s\n", str_error(rc));
-                goto error;
-        }
-        
-        http = http_create(uri->host, port);
+                uri_destroy(uri);
+                return rc;
+        }
+        
+        http_t *http = http_create(uri->host, port);
         if (http == NULL) {
+                uri_destroy(uri);
                 fprintf(stderr, "Failed creating HTTP object\n");
-                rc = ENOMEM;
-                goto error;
+                return 3;
         }
         
@@ -193 +156 @@
         if (rc != EOK) {
                 fprintf(stderr, "Failed connecting: %s\n", str_error(rc));
-                rc = EIO;
-                goto error;
+                uri_destroy(uri);
+                return rc;
         }
         
@@ -200 +163 @@
         if (rc != EOK) {
                 fprintf(stderr, "Failed sending request: %s\n", str_error(rc));
-                rc = EIO;
-                goto error;
+                uri_destroy(uri);
+                return rc;
         }
         
@@ -209 +172 @@
         if (rc != EOK) {
                 fprintf(stderr, "Failed receiving response: %s\n", str_error(rc));
-                rc = EIO;
-                goto error;
+                uri_destroy(uri);
+                return rc;
         }
         
@@ -216 +179 @@
                 fprintf(stderr, "Server returned status %d %s\n", response->status,
                     response->message);
-        } else {
-                buf = malloc(buf_size);
+        }
+        else {
+                size_t buf_size = 4096;
+                void *buf = malloc(buf_size);
                 if (buf == NULL) {
                         fprintf(stderr, "Failed allocating buffer\n)");
-                        rc = ENOMEM;
-                        goto error;
+                        uri_destroy(uri);
+                        return ENOMEM;
                 }
                 
                 int body_size;
                 while ((body_size = recv_buffer(&http->recv_buffer, buf, buf_size)) > 0) {
-                        fwrite(buf, 1, body_size, ofile != NULL ? ofile : stdout);
+                        fwrite(buf, 1, body_size, stdout);
                 }
                 
@@ -234 +199 @@
         }
         
-        free(buf);
-        http_destroy(http);
         uri_destroy(uri);
-        if (ofile != NULL && fclose(ofile) != 0) {
-                printf("Error writing '%s'.\n", ofname);
-                return EIO;
-        }
-
         return EOK;
-error:
-        free(buf);
-        if (http != NULL)
-                http_destroy(http);
-        if (uri != NULL)
-                uri_destroy(uri);
-        if (ofile != NULL)
-                fclose(ofile);
-        return rc;
 }