diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/freeramdisk.c | 2 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 2 | ||||
| -rw-r--r-- | util-linux/mount.c | 2 | ||||
| -rw-r--r-- | util-linux/swaponoff.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 5d110bc4b..2293d3ee6 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -24,7 +24,7 @@ int freeramdisk_main(int argc, char **argv) fd = xopen(argv[1], O_RDWR); // Act like freeramdisk, fdflush, or both depending on configuration. - result = ioctl(fd, (ENABLE_FREERAMDISK && bb_applet_name[1]=='r') + result = ioctl(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r') || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH); if (ENABLE_FEATURE_CLEAN_UP) close(fd); diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index c0dda2f1f..a2ca7a566 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -1343,7 +1343,7 @@ int fsck_minix_main(int argc, char **argv) * flags and whether or not the -f switch was specified on the * command line. */ - printf("%s, %s\n", bb_applet_name, program_version); + printf("%s, %s\n", applet_name, program_version); if (!(Super.s_state & MINIX_ERROR_FS) && (Super.s_state & MINIX_VALID_FS) && !force) { if (repair) diff --git a/util-linux/mount.c b/util-linux/mount.c index 899bf8557..141517ba0 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -707,7 +707,7 @@ static int daemonize(void) dup2(fd, 2); if (fd > 2) close(fd); setsid(); - openlog(bb_applet_name, LOG_PID, LOG_DAEMON); + openlog(applet_name, LOG_PID, LOG_DAEMON); logmode = LOGMODE_SYSLOG; return 1; } diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 4fcb239b6..8434d121c 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -24,7 +24,7 @@ static int swap_enable_disable(char *device) if (st.st_blocks * 512 < st.st_size) bb_error_msg_and_die("swap file has holes"); - if (bb_applet_name[5] == 'n') + if (applet_name[5] == 'n') status = swapon(device, 0); else status = swapoff(device); |