emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messages: by popular request allow PATH to be customized at build time

Browse Source 
mount: smallish code shrink
This commit is contained in:
Denis Vlasenko 2007-09-07 19:33:56 +00:00
parent d7ecd863c8
commit c8d4d2f11d
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libbb/messages.c
View File

@ -7,13 +7,21 @@
#include "libbb.h" #include "libbb.h"
#ifndef BB_EXTRA_VERSION /* allow default system PATH to be extended via CFLAGS */
#define BANNER "BusyBox v" BB_VER " (" BB_BT ")" #ifndef BB_ADDITIONAL_PATH
#else #define BB_ADDITIONAL_PATH ""
#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
#endif #endif
/* allow version to be extended, via CFLAGS */
#ifndef BB_EXTRA_VERSION
#define BB_EXTRA_VERSION BB_BT
#endif
#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
const char bb_banner[] ALIGN1 = BANNER; const char bb_banner[] ALIGN1 = BANNER;
const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted"; const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'"; const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
const char bb_msg_write_error[] ALIGN1 = "write error"; const char bb_msg_write_error[] ALIGN1 = "write error";
@ -39,7 +47,8 @@ const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
* but I want to save a few bytes here. Check libbb.h before changing! */ * but I want to save a few bytes here. Check libbb.h before changing! */
const char bb_PATH_root_path[] ALIGN1 = "PATH=/sbin:/usr/sbin:/bin:/usr/bin"; const char bb_PATH_root_path[] ALIGN1 =
"PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH;
const int const_int_0; const int const_int_0;
@ -49,11 +58,11 @@ const int const_int_1 = 1;
/* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */ /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
const char bb_path_wtmp_file[] ALIGN1 = const char bb_path_wtmp_file[] ALIGN1 =
#if defined _PATH_WTMP #if defined _PATH_WTMP
_PATH_WTMP; _PATH_WTMP;
#elif defined WTMP_FILE #elif defined WTMP_FILE
WTMP_FILE; WTMP_FILE;
#else #else
# error unknown path to wtmp file #error unknown path to wtmp file
#endif #endif
char bb_common_bufsiz1[COMMON_BUFSIZE]; char bb_common_bufsiz1[COMMON_BUFSIZE];

5
util-linux/mount.c
View File

@ -1527,11 +1527,10 @@ static int singlemount(struct mntent *mp, int ignore_busy)
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(filteropts); free(filteropts);
if (rc && errno == EBUSY && ignore_busy) if (errno == EBUSY && ignore_busy)
rc = 0; return 0;
if (rc < 0) if (rc < 0)
bb_perror_msg("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); bb_perror_msg("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
return rc; return rc;
} }