diff options
| -rw-r--r-- | disk-utils/mkfs.8 | 16 | ||||
| -rw-r--r-- | disk-utils/mkfs.c | 17 |
2 files changed, 3 insertions, 30 deletions
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8 index 9a5cdc016..02792601e 100644 --- a/disk-utils/mkfs.8 +++ b/disk-utils/mkfs.8 @@ -29,20 +29,8 @@ In actuality, is simply a front-end for the various filesystem builders (\fBmkfs.\fIfstype\fR) available under Linux. -The filesystem-specific builder is searched for in a number -of directories, like perhaps -.IR /sbin , -.IR /sbin/fs , -.IR /sbin/fs.d , -.IR /etc/fs , -.I /etc -(the precise list is defined at compile time but at least -contains -.I /sbin -and -.IR /sbin/fs ), -and finally in the directories -listed in the PATH environment variable. +The filesystem-specific builder is searched for via your PATH +environment setting only. Please see the filesystem-specific builder manual pages for further details. .SH OPTIONS diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 08c4ef0b0..cf1a312d9 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -38,10 +38,6 @@ #define DEFAULT_FSTYPE "ext2" #endif -#define SEARCH_PATH "PATH=" FS_SEARCH_PATH -#define PROGNAME "mkfs.%s" - - static void __attribute__ ((__noreturn__)) usage(FILE * out) { fputs(USAGE_HEADER, out); @@ -78,7 +74,6 @@ int main(int argc, char **argv) char *progname; /* name of executable to be called */ char *fstype = NULL; int i, more = 0, verbose = 0; - char *oldpath, *newpath; enum { VERSION_OPTION = CHAR_MAX + 1 }; @@ -126,17 +121,7 @@ int main(int argc, char **argv) if (fstype == NULL) fstype = DEFAULT_FSTYPE; - /* Set PATH and program name */ - oldpath = getenv("PATH"); - if (!oldpath) - oldpath = "/bin"; - - newpath = xmalloc(strlen(oldpath) + sizeof(SEARCH_PATH) + 3); - sprintf(newpath, "%s:%s\n", SEARCH_PATH, oldpath); - putenv(newpath); - - progname = xmalloc(sizeof(PROGNAME) + strlen(fstype) + 1); - sprintf(progname, PROGNAME, fstype); + xasprintf(&progname, "mkfs.%s", fstype); argv[--optind] = progname; if (verbose) { |