diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2018-01-02 04:10:24 +0200 |
|---|---|---|
| committer | Jason Riordan <jriordan001@gmail.com> | 2018-02-23 03:29:28 +0000 |
| commit | 7f69aba7f95f3eb256b3fa5aae9ac937e1427070 (patch) | |
| tree | ef6926ea7afe73971b446b2a59facb771b3176c4 | |
| parent | 8e492e7b8fbc5bdcd4b259b9acf3e6e0b6863471 (diff) | |
| download | android_external_e2fsprogs-lineage-15.1_20180224.tar.gz android_external_e2fsprogs-lineage-15.1_20180224.tar.bz2 android_external_e2fsprogs-lineage-15.1_20180224.zip | |
Revert "e2fsprogs: Always set program_name"lineage-15.1_20180224
This reverts commit 33c010c5f3a72255803af97e5acbcfe93b54de88.
Change-Id: Ie6fafa4f7852bd2ff488958fd916d7b4806c593a
| -rw-r--r-- | misc/mke2fs.c | 4 | ||||
| -rw-r--r-- | misc/tune2fs.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index e6a6e103..2b7b6d3b 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -76,7 +76,11 @@ extern int optind; extern int isatty(int); extern FILE *fpopen(const char *cmd, const char *mode); +#ifndef BUILD_AS_LIB const char * program_name = "mke2fs"; +#else +extern const char *program_name; +#endif static const char * device_name /* = NULL */; /* Command line options */ diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 09e65baf..dcaafc1c 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -72,7 +72,11 @@ extern int optind; extern int ask_yn(const char *string, int def); +#ifndef BUILD_AS_LIB const char *program_name = "tune2fs"; +#else +extern const char *program_name; +#endif char *device_name; char *new_label, *new_last_mounted, *new_UUID; char *io_options; |