svn commit: trunk/busybox: archival coreutils

[aldot at busybox.net]

Author: aldot
Date: 2006-05-29 05:10:23 -0700 (Mon, 29 May 2006)
New Revision: 15218

Log:
- ls: remove unused variable
- dpkg.c, diff: use xstat
   text    data     bss     dec     hex filename
 848823    9100  645216 1503139  16efa3 busybox_old
 848679    9100  645216 1502995  16ef13 busybox_unstripped
bloatcheck is completely useless as it sees -79 for this, which is bogus.


Modified:
   trunk/busybox/archival/dpkg.c
   trunk/busybox/coreutils/diff.c
   trunk/busybox/coreutils/ls.c


Changeset:
Modified: trunk/busybox/archival/dpkg.c
===================================================================
--- trunk/busybox/archival/dpkg.c	2006-05-29 07:42:02 UTC (rev 15217)
+++ trunk/busybox/archival/dpkg.c	2006-05-29 12:10:23 UTC (rev 15218)
@@ -874,9 +874,7 @@
 	/* Create a separate backfile to dpkg */
 	if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) {
 		struct stat stat_buf;
-		if (stat("/var/lib/dpkg/status", &stat_buf) == 0) {
-			bb_error_msg_and_die("Couldnt create backup status file");
-		}
+		xstat("/var/lib/dpkg/status", &stat_buf);
 		/* Its ok if renaming the status file fails because status
 		 * file doesnt exist, maybe we are starting from scratch */
 		bb_error_msg("No status file found, creating new one");

Modified: trunk/busybox/coreutils/diff.c
===================================================================
--- trunk/busybox/coreutils/diff.c	2006-05-29 07:42:02 UTC (rev 15217)
+++ trunk/busybox/coreutils/diff.c	2006-05-29 12:10:23 UTC (rev 15218)
@@ -1237,13 +1237,13 @@
         if (strcmp(argv[0], "-") == 0) {
                 fstat(STDIN_FILENO, &stb1);
                 gotstdin = 1;
-        } else if (stat(argv[0], &stb1) != 0)
-                bb_perror_msg_and_die("Couldn't stat %s", argv[0]);
+        } else
+			xstat(argv[0], &stb1);
         if (strcmp(argv[1], "-") == 0) {
                 fstat(STDIN_FILENO, &stb2);
                 gotstdin = 1;
-        } else if (stat(argv[1], &stb2) != 0)
-                bb_perror_msg_and_die("Couldn't stat %s", argv[1]);
+        } else
+			xstat(argv[1], &stb2);
         if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
                 bb_error_msg_and_die("Can't compare - to a directory");
         if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
@@ -1256,13 +1256,11 @@
 	else {
 		if (S_ISDIR(stb1.st_mode)) {
 			argv[0] = concat_path_file(argv[0], argv[1]);
-			if (stat(argv[0], &stb1) < 0)
-				bb_perror_msg_and_die("Couldn't stat %s", argv[0]);
+			xstat(argv[0], &stb1);
 		}
 		if (S_ISDIR(stb2.st_mode)) {
 			argv[1] = concat_path_file(argv[1], argv[0]);
-			if (stat(argv[1], &stb2) < 0)
-				bb_perror_msg_and_die("Couldn't stat %s", argv[1]);
+			xstat(argv[1], &stb2);
 		}
 		print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1], NULL);
 	}

Modified: trunk/busybox/coreutils/ls.c
===================================================================
--- trunk/busybox/coreutils/ls.c	2006-05-29 07:42:02 UTC (rev 15217)
+++ trunk/busybox/coreutils/ls.c	2006-05-29 12:10:23 UTC (rev 15218)
@@ -208,18 +208,15 @@
 #ifdef CONFIG_SELINUX
 	security_context_t sid=NULL;
 #endif
-	int rc;
 
 #ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
 	if (all_fmt & FOLLOW_LINKS) {
 #ifdef CONFIG_SELINUX
-	        if (is_selinux_enabled())  {
-		  rc=0; /*  Set the number which means success before hand.  */
-		  rc = getfilecon(fullname,&sid);
+		if (is_selinux_enabled())  {
+			 getfilecon(fullname,&sid);
 		}
 #endif
-		rc = stat(fullname, &dstat);
-		if(rc) {
+		if (stat(fullname, &dstat)) {
 			bb_perror_msg("%s", fullname);
 			status = EXIT_FAILURE;
 			return 0;
@@ -229,12 +226,10 @@
 	{
 #ifdef CONFIG_SELINUX
 	        if  (is_selinux_enabled())  {
-		  rc=0; /*  Set the number which means success before hand.  */
-		  rc = lgetfilecon(fullname,&sid);
+		  lgetfilecon(fullname,&sid);
 		}
 #endif
-		rc = lstat(fullname, &dstat);
-		if(rc) {
+		if (lstat(fullname, &dstat)) {
 			bb_perror_msg("%s", fullname);
 			status = EXIT_FAILURE;
 			return 0;