diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:43 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:43 +0000 |
commit | 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (patch) | |
tree | 8c555cc94aca9fabd177526e554d93bed4886642 /util-linux | |
parent | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (diff) | |
download | busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.gz busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.bz2 busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.zip |
bb_applet_name -> applet_name
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) | |||
24 | fd = xopen(argv[1], O_RDWR); | 24 | fd = xopen(argv[1], O_RDWR); |
25 | 25 | ||
26 | // Act like freeramdisk, fdflush, or both depending on configuration. | 26 | // Act like freeramdisk, fdflush, or both depending on configuration. |
27 | result = ioctl(fd, (ENABLE_FREERAMDISK && bb_applet_name[1]=='r') | 27 | result = ioctl(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r') |
28 | || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH); | 28 | || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH); |
29 | 29 | ||
30 | if (ENABLE_FEATURE_CLEAN_UP) close(fd); | 30 | 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) | |||
1343 | * flags and whether or not the -f switch was specified on the | 1343 | * flags and whether or not the -f switch was specified on the |
1344 | * command line. | 1344 | * command line. |
1345 | */ | 1345 | */ |
1346 | printf("%s, %s\n", bb_applet_name, program_version); | 1346 | printf("%s, %s\n", applet_name, program_version); |
1347 | if (!(Super.s_state & MINIX_ERROR_FS) && | 1347 | if (!(Super.s_state & MINIX_ERROR_FS) && |
1348 | (Super.s_state & MINIX_VALID_FS) && !force) { | 1348 | (Super.s_state & MINIX_VALID_FS) && !force) { |
1349 | if (repair) | 1349 | 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) | |||
707 | dup2(fd, 2); | 707 | dup2(fd, 2); |
708 | if (fd > 2) close(fd); | 708 | if (fd > 2) close(fd); |
709 | setsid(); | 709 | setsid(); |
710 | openlog(bb_applet_name, LOG_PID, LOG_DAEMON); | 710 | openlog(applet_name, LOG_PID, LOG_DAEMON); |
711 | logmode = LOGMODE_SYSLOG; | 711 | logmode = LOGMODE_SYSLOG; |
712 | return 1; | 712 | return 1; |
713 | } | 713 | } |
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) | |||
24 | if (st.st_blocks * 512 < st.st_size) | 24 | if (st.st_blocks * 512 < st.st_size) |
25 | bb_error_msg_and_die("swap file has holes"); | 25 | bb_error_msg_and_die("swap file has holes"); |
26 | 26 | ||
27 | if (bb_applet_name[5] == 'n') | 27 | if (applet_name[5] == 'n') |
28 | status = swapon(device, 0); | 28 | status = swapon(device, 0); |
29 | else | 29 | else |
30 | status = swapoff(device); | 30 | status = swapoff(device); |