svn commit: trunk/busybox/e2fsprogs

[vodz at busybox.net]

Author: vodz
Date: 2005-11-26 03:01:23 -0800 (Sat, 26 Nov 2005)
New Revision: 12536

Log:
remove bug: fsck do not know path

Modified:
   trunk/busybox/e2fsprogs/fsck.c
   trunk/busybox/e2fsprogs/fsck.h
   trunk/busybox/e2fsprogs/util.c
   trunk/busybox/e2fsprogs/util.h


Changeset:
Modified: trunk/busybox/e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/fsck.c	2005-11-26 10:45:26 UTC (rev 12535)
+++ trunk/busybox/e2fsprogs/fsck.c	2005-11-26 11:01:23 UTC (rev 12536)
@@ -1361,7 +1361,7 @@
 		fstab = _PATH_MNTTAB;
 	load_fs_info(fstab);
 
-	e2fs_set_sbin_path();
+	fsck_path = e2fs_set_sbin_path();
 
 	if ((num_devices == 1) || (serialize))
 		interactive = 1;
@@ -1405,8 +1405,6 @@
 		}
 	}
 	status |= wait_many(FLAG_WAIT_ALL);
-	if (ENABLE_FEATURE_CLEAN_UP)
-		free(fsck_path);
 	blkid_put_cache(cache);
 	return status;
 }

Modified: trunk/busybox/e2fsprogs/fsck.h
===================================================================
--- trunk/busybox/e2fsprogs/fsck.h	2005-11-26 10:45:26 UTC (rev 12535)
+++ trunk/busybox/e2fsprogs/fsck.h	2005-11-26 11:01:23 UTC (rev 12536)
@@ -13,4 +13,4 @@
 #define FSCK_CANCELED    32     /* Aborted with a signal or ^C */
 #define EXIT_LIBRARY     128
 
-extern void e2fs_set_sbin_path(void);
+extern char *e2fs_set_sbin_path(void);

Modified: trunk/busybox/e2fsprogs/util.c
===================================================================
--- trunk/busybox/e2fsprogs/util.c	2005-11-26 10:45:26 UTC (rev 12535)
+++ trunk/busybox/e2fsprogs/util.c	2005-11-26 11:01:23 UTC (rev 12536)
@@ -254,13 +254,15 @@
 		puts("done");
 }
 
-void e2fs_set_sbin_path(void)
+char *e2fs_set_sbin_path(void)
 {
 	char *oldpath = getenv("PATH");
 	/* Update our PATH to include /sbin  */
 #define PATH_SET "/sbin"
-	if (oldpath)
-		putenv (bb_xasprintf("%s:%s", PATH_SET, oldpath));
-	else
-		putenv (PATH_SET);
+	if (oldpath) 
+		oldpath = bb_xasprintf("%s:%s", PATH_SET, oldpath);
+	 else 
+		oldpath = PATH_SET;
+	putenv (oldpath);
+	return oldpath;
 }

Modified: trunk/busybox/e2fsprogs/util.h
===================================================================
--- trunk/busybox/e2fsprogs/util.h	2005-11-26 10:45:26 UTC (rev 12535)
+++ trunk/busybox/e2fsprogs/util.h	2005-11-26 11:01:23 UTC (rev 12536)
@@ -18,4 +18,4 @@
 extern void print_check_message(ext2_filsys fs);
 extern void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int force);
 extern void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, int quiet);
-extern void e2fs_set_sbin_path(void);
+extern char *e2fs_set_sbin_path(void);