Changeset 0759f0018198c010a53e009a3841cb7a68f192fc

Timestamp:

11/04/2009 04:57:42 PM (3 years ago)

Author:

Jeremy Lainé <jeremy.laine@…>

Parents:

1ae82be93ee904c7ed68b90aacef05a3e593b505

git-committer:

Jeremy Lainé <jeremy.laine@…> (11/04/2009 04:57:42 PM)

Message:

improve cURL detection

Files:

• src/boc-flash.cpp (modified) (4 diffs)

src/boc-flash.cpp

@@ -56 +56 @@
     string command = string("curl -sI ") + url + " 2> /dev/null";
 
-    // check whether curl is present
+    // if curl is not present return bogus size of 1 byte
     if (!use_curl)
+        return 1;
+
+    if (!(in = popen(command.c_str(), "r")))
         return -1;
-    if (!(in = popen(command.c_str(), "r")))
-    {
-        use_curl = false;
-        return -1;
-    }
 
     // read headers
@@ -71 +69 @@
     int ret = pclose(in);
     if  (ret < 0 || WEXITSTATUS(ret))
-    {
-        use_curl = false;
         return -1;
-    }
 
     // parse headers
@@ -125 +120 @@
     }
 
-    /* temporary file */
-    string tempfile;
-    if (stat("/media/ram", &test) == 0)
+    /* detect curl */
+    int ret = system("curl -h > /dev/null 2>&1");
+    if  (ret < 0 || WEXITSTATUS(ret))
     {
-        tempfile = "/media/ram/boc-flash";
+        cerr << "Using wget for downloads" << endl;
+        use_curl = false;
     } else {
-        tempfile = "/tmp/boc-flash";
+        cerr << "Using cURL for downloads" << endl;
+        use_curl = true;
     }
 
@@ -142 +139 @@
         task.partition = string(argv[optind]);
         task.url = string(argv[optind + 1]);
+        task.size = getSize(task.url);
 
-        /* optionaly determine file size */
-        int size = getSize(task.url);
-        if (size > 0)
-            task.size = size;
-        else
-            task.size = 1;
+        /* check we got a file size */
+        if (task.size < 0)
+        {
+            cerr << "Could not determine size of " << task.url << endl;
+            return EXIT_FAILURE;
+        }
 
         tasks.push_back(task);
         taskTotal += task.size;
     }
-    if (use_curl)
-        cerr << "Using cURL for downloads" << endl;
-    else
-        cerr << "Using wget for downloads" << endl;
+    /* temporary file */
+    string tempfile;
+    if (stat("/media/ram", &test) == 0)
+    {
+        tempfile = "/media/ram/boc-flash";
+    } else {
+        tempfile = "/tmp/boc-flash";
+    }
 
     /* run tasks */