r4238 - trunk/src/target/opkg/libopkg

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-03-20 16:21:30 +0100 (Thu, 20 Mar 2008)
New Revision: 4238

Modified:
   trunk/src/target/opkg/libopkg/opkg.h
   trunk/src/target/opkg/libopkg/opkg_download.c
Log:
opkg: remove some "#if 0" code


Modified: trunk/src/target/opkg/libopkg/opkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.h	2008-03-20 15:13:58 UTC (rev 4237)
+++ trunk/src/target/opkg/libopkg/opkg.h	2008-03-20 15:21:30 UTC (rev 4238)
@@ -22,10 +22,6 @@
 #include "config.h"
 #endif
 
-#if 0
-#define OPKG_DEBUG_NO_TMP_CLEANUP
-#endif
-
 #include "includes.h"
 #include "opkg_conf.h"
 #include "opkg_message.h"

Modified: trunk/src/target/opkg/libopkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_download.c	2008-03-20 15:13:58 UTC (rev 4237)
+++ trunk/src/target/opkg/libopkg/opkg_download.c	2008-03-20 15:21:30 UTC (rev 4238)
@@ -121,31 +121,6 @@
 	setenv("no_proxy", conf->no_proxy, 1);
     }
 
-    /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ 
-#if 0
-    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
-		  (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
-		  conf->proxy_user ? "--proxy-user=" : "",
-		  conf->proxy_user ? conf->proxy_user : "",
-		  conf->proxy_passwd ? "--proxy-passwd=" : "",
-		  conf->proxy_passwd ? conf->proxy_passwd : "",
-		  conf->verbose_wget ? "" : "-q",
-		  conf->tmp_dir,
-		  src);
-    err = xsystem(cmd);
-    if (err) {
-	if (err != -1) {
-	    opkg_message(conf,OPKG_ERROR, "%s: ERROR: Command failed with return value %d: `%s'\n",
-		    __FUNCTION__, err, cmd);
-	} 
-	unlink(tmp_file_location);
-	free(tmp_file_location);
-	free(src_basec);
-	free(cmd);
-	return EINVAL;
-    }
-    free(cmd);
-#endif
     CURL *curl;
     CURLcode res;
     FILE * file = fopen (tmp_file_location, "w");