diff options
author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-12 16:22:19 +0000 |
---|---|---|
committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-12 16:22:19 +0000 |
commit | d20cfbd3034ad41c0d99e7578156389f385c7340 (patch) | |
tree | b6fa54ac8c77c11156f4f214a0cda7ab3c318a45 /e2fsprogs/fsck.c | |
parent | 6c35c7c97628cb81eb26c2a059b0dde2879d91aa (diff) | |
download | busybox-w32-d20cfbd3034ad41c0d99e7578156389f385c7340.tar.gz busybox-w32-d20cfbd3034ad41c0d99e7578156389f385c7340.tar.bz2 busybox-w32-d20cfbd3034ad41c0d99e7578156389f385c7340.zip |
create e2fs_set_sbin_path(), noticed by Tito, Thanks
Diffstat (limited to 'e2fsprogs/fsck.c')
-rw-r--r-- | e2fsprogs/fsck.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index 7799faec0..36eebf2c5 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c | |||
@@ -282,7 +282,6 @@ static int kill_sent; | |||
282 | static char *fstype; | 282 | static char *fstype; |
283 | static struct fs_info *filesys_info, *filesys_last; | 283 | static struct fs_info *filesys_info, *filesys_last; |
284 | static struct fsck_instance *instance_list; | 284 | static struct fsck_instance *instance_list; |
285 | static const char *fsck_prefix_path = "/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc"; | ||
286 | static char *fsck_path; | 285 | static char *fsck_path; |
287 | static blkid_cache cache; | 286 | static blkid_cache cache; |
288 | 287 | ||
@@ -1349,7 +1348,6 @@ int fsck_main(int argc, char *argv[]) | |||
1349 | { | 1348 | { |
1350 | int i, status = 0; | 1349 | int i, status = 0; |
1351 | int interactive = 0; | 1350 | int interactive = 0; |
1352 | char *oldpath = getenv("PATH"); | ||
1353 | const char *fstab; | 1351 | const char *fstab; |
1354 | struct fs_info *fs; | 1352 | struct fs_info *fs; |
1355 | 1353 | ||
@@ -1367,12 +1365,7 @@ int fsck_main(int argc, char *argv[]) | |||
1367 | fstab = _PATH_MNTTAB; | 1365 | fstab = _PATH_MNTTAB; |
1368 | load_fs_info(fstab); | 1366 | load_fs_info(fstab); |
1369 | 1367 | ||
1370 | /* Update our search path to include uncommon directories. */ | 1368 | e2fs_set_sbin_path(); |
1371 | if (oldpath) { | ||
1372 | fsck_path = bb_xasprintf("%s:%s", fsck_prefix_path, oldpath); | ||
1373 | } else { | ||
1374 | fsck_path = string_copy(fsck_prefix_path); | ||
1375 | } | ||
1376 | 1369 | ||
1377 | if ((num_devices == 1) || (serialize)) | 1370 | if ((num_devices == 1) || (serialize)) |
1378 | interactive = 1; | 1371 | interactive = 1; |