BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apply accumulated post-1.6.1 patches, and bump version to 1.6.2

1_6_stable 1_6_2
Denis Vlasenko 2007-11-26 07:17:52 +00:00
parent 52c886144f
commit a0ec7918f3
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 6
SUBLEVEL = 1
SUBLEVEL = 2
EXTRAVERSION =
NAME = Unnamed

8
coreutils/date.c
View File

@ -32,16 +32,10 @@
#define DATE_OPT_TIMESPEC 0x20
#define DATE_OPT_HINT 0x40
static void xputenv(char *s)
{
if (putenv(s) != 0)
bb_error_msg_and_die(bb_msg_memory_exhausted);
}
static void maybe_set_utc(int opt)
{
if (opt & DATE_OPT_UTC)
xputenv((char*)"TZ=UTC0");
putenv((char*)"TZ=UTC0");
}
int date_main(int argc, char **argv);

3
init/init.c
View File

@ -277,6 +277,9 @@ static void console_init(void)
while (fd > 2) close(fd--);
}
messageD(L_LOG, "console='%s'", s);
} else {
/* Make sure fd 0,1,2 are not closed */
bb_sanitize_stdio();
}
s = getenv("TERM");

10
loginutils/adduser.c
View File

@ -109,8 +109,9 @@ static int adduser(struct passwd *p)
if (putpwent(p, file) == -1) {
bb_perror_nomsg_and_die();
}
if (ENABLE_FEATURE_CLEAN_UP)
fclose(file);
/* Do fclose even if !ENABLE_FEATURE_CLEAN_UP.
* We will exec passwd, files must be flushed & closed before that! */
fclose(file);
#if ENABLE_FEATURE_SHADOWPASSWDS
/* add to shadow if necessary */
@ -123,8 +124,7 @@ static int adduser(struct passwd *p)
0, /* sp->sp_min */
99999, /* sp->sp_max */
7); /* sp->sp_warn */
if (ENABLE_FEATURE_CLEAN_UP)
fclose(file);
fclose(file);
}
#endif
@ -134,7 +134,7 @@ static int adduser(struct passwd *p)
if (addgroup) addgroup_wrapper(p);
/* Clear the umask for this process so it doesn't
* * screw up the permissions on the mkdir and chown. */
* screw up the permissions on the mkdir and chown. */
umask(0);
if (!(option_mask32 & OPT_DONT_MAKE_HOME)) {
/* Set the owner and group so it is owned by the new user,