From d2c306e862abf49dd4b1ff1d1bd1a789317b7905 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Mon, 29 May 2006 12:10:23 +0000
Subject: [PATCH] - 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.

---
 archival/dpkg.c  |  4 +---
 coreutils/diff.c | 14 ++++++--------
 coreutils/ls.c   | 15 +++++----------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/archival/dpkg.c b/archival/dpkg.c
index c911333e0..32e51257e 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -874,9 +874,7 @@ static void write_status_file(deb_file_t **deb_file)
 	/* 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");
diff --git a/coreutils/diff.c b/coreutils/diff.c
index c9274e64f..a1a74d51e 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -1237,13 +1237,13 @@ int diff_main(int argc, char **argv) {
         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 @@ int diff_main(int argc, char **argv) {
 	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);
 	}
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 3fe0c8dad..9c0e8f17d 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -208,18 +208,15 @@ static struct dnode *my_stat(char *fullname, char *name)
 #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 @@ static struct dnode *my_stat(char *fullname, char *name)
 	{
 #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;