Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-13 06:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Latest patch from vodz. Adds a check for divide by zero in the posix

Browse Source 
math suport, cleaner math syntax error checking, moves redundant signal
string tables (from kill and ash) into libbb and provides a few
cleanups elsewhere.
This commit is contained in:
Eric Andersen 2001-08-02 05:02:46 +00:00
parent 2d91deba45
commit 3450636169
17 changed files with 187 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -247,7 +247,7 @@ safe_read.c safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \
trim.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \ trim.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \
xgetcwd.c xreadlink.c xregcomp.c interface.c remove_file.c last_char_is.c \ xgetcwd.c xreadlink.c xregcomp.c interface.c remove_file.c last_char_is.c \
copyfd.c vherror_msg.c herror_msg.c herror_msg_and_die.c xgethostbyname.c \ copyfd.c vherror_msg.c herror_msg.c herror_msg_and_die.c xgethostbyname.c \
dirname.c make_directory.c create_icmp_socket.c arith.c dirname.c make_directory.c create_icmp_socket.c u_signal_names.c arith.c
LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC)) LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
LIBBB_CFLAGS = -I$(LIBBB) LIBBB_CFLAGS = -I$(LIBBB)
ifneq ($(strip $(BB_SRC_DIR)),) ifneq ($(strip $(BB_SRC_DIR)),)

171
ash.c
View File

@ -52,6 +52,7 @@
/* If you need ash to act as a full Posix shell, with full math /* If you need ash to act as a full Posix shell, with full math
* support, enable this. This adds a bit over 2k an x86 system. */ * support, enable this. This adds a bit over 2k an x86 system. */
//#undef ASH_MATH_SUPPORT
#define ASH_MATH_SUPPORT #define ASH_MATH_SUPPORT
/* Getopts is used by shell procedures to parse positional parameters. /* Getopts is used by shell procedures to parse positional parameters.
@ -78,8 +79,6 @@
/* These are here to work with glibc -- Don't change these... */ /* These are here to work with glibc -- Don't change these... */
#undef FNMATCH_BROKEN #undef FNMATCH_BROKEN
#undef GLOB_BROKEN #undef GLOB_BROKEN
#undef _GNU_SOURCE
#undef __USE_GNU
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
@ -4839,6 +4838,7 @@ static void
expari(int flag) expari(int flag)
{ {
char *p, *start; char *p, *start;
int errcode;
int result; int result;
int begoff; int begoff;
int quotes = flag & (EXP_FULL | EXP_CASE); int quotes = flag & (EXP_FULL | EXP_CASE);
@ -4877,9 +4877,13 @@ expari(int flag)
removerecordregions(begoff); removerecordregions(begoff);
if (quotes) if (quotes)
rmescapes(p+2); rmescapes(p+2);
result = arith(p+2); result = arith(p+2, &errcode);
if (result < 0) if (errcode < 0) {
error("arith: syntax error: \"%s\"\n", p+2); if(errcode == -2)
error("divide by zero");
else
error("syntax error: \"%s\"\n", p+2);
}
snprintf(p, 12, "%d", result); snprintf(p, 12, "%d", result);
while (*p++) while (*p++)
@ -5429,9 +5433,9 @@ expandmeta(str, flag)
goto nometa; goto nometa;
p = preglob(str->text); p = preglob(str->text);
INTOFF; INTOFF;
switch (glob(p, GLOB_NOMAGIC, 0, &pglob)) { switch (glob(p, 0, 0, &pglob)) {
case 0: case 0:
if (!(pglob.gl_flags & GLOB_MAGCHAR)) if(pglob.gl_pathv[1]==0 && !strcmp(p, pglob.gl_pathv[0]))
goto nometa2; goto nometa2;
addglob(&pglob); addglob(&pglob);
globfree(&pglob); globfree(&pglob);
@ -6006,7 +6010,7 @@ static int histcmd(argc, argv)
struct redirtab { struct redirtab {
struct redirtab *next; struct redirtab *next;
short renamed[10]; /* Current ash support only 0-9 descriptors */ short renamed[10]; /* Current ash support only 0-9 descriptors */
/* char renamed[10]; */ /* char on arm (and others) can't be negative */ /* char on arm (and others) can't be negative */
}; };
static struct redirtab *redirlist; static struct redirtab *redirlist;
@ -6166,7 +6170,7 @@ preadfd(void)
retry: retry:
#ifdef BB_FEATURE_COMMAND_EDITING #ifdef BB_FEATURE_COMMAND_EDITING
{ {
if (parsefile->fd) if (!iflag || parsefile->fd)
nr = safe_read(parsefile->fd, buf, BUFSIZ - 1); nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
else { else {
nr = cmdedit_read_input((char*)cmdedit_prompt, buf); nr = cmdedit_read_input((char*)cmdedit_prompt, buf);
@ -6468,80 +6472,6 @@ static void setjobctl(int enable)
#endif #endif
/* A translation list so we can be polite to our users. */
static char *signal_names[NSIG + 2] = {
"EXIT",
"SIGHUP",
"SIGINT",
"SIGQUIT",
"SIGILL",
"SIGTRAP",
"SIGABRT",
"SIGBUS",
"SIGFPE",
"SIGKILL",
"SIGUSR1",
"SIGSEGV",
"SIGUSR2",
"SIGPIPE",
"SIGALRM",
"SIGTERM",
"SIGJUNK(16)",
"SIGCHLD",
"SIGCONT",
"SIGSTOP",
"SIGTSTP",
"SIGTTIN",
"SIGTTOU",
"SIGURG",
"SIGXCPU",
"SIGXFSZ",
"SIGVTALRM",
"SIGPROF",
"SIGWINCH",
"SIGIO",
"SIGPWR",
"SIGSYS",
#ifdef SIGRTMIN
"SIGRTMIN",
"SIGRTMIN+1",
"SIGRTMIN+2",
"SIGRTMIN+3",
"SIGRTMIN+4",
"SIGRTMIN+5",
"SIGRTMIN+6",
"SIGRTMIN+7",
"SIGRTMIN+8",
"SIGRTMIN+9",
"SIGRTMIN+10",
"SIGRTMIN+11",
"SIGRTMIN+12",
"SIGRTMIN+13",
"SIGRTMIN+14",
"SIGRTMIN+15",
"SIGRTMAX-15",
"SIGRTMAX-14",
"SIGRTMAX-13",
"SIGRTMAX-12",
"SIGRTMAX-11",
"SIGRTMAX-10",
"SIGRTMAX-9",
"SIGRTMAX-8",
"SIGRTMAX-7",
"SIGRTMAX-6",
"SIGRTMAX-5",
"SIGRTMAX-4",
"SIGRTMAX-3",
"SIGRTMAX-2",
"SIGRTMAX-1",
"SIGRTMAX",
#endif
"DEBUG",
(char *)0x0,
};
#ifdef JOBS #ifdef JOBS
static int static int
killcmd(argc, argv) killcmd(argc, argv)
@ -6599,18 +6529,20 @@ usage:
} }
if (list) { if (list) {
const char *name;
if (!*argptr) { if (!*argptr) {
out1str("0\n"); out1str("0\n");
for (i = 1; i < NSIG; i++) { for (i = 1; i < NSIG; i++) {
printf(snlfmt, signal_names[i] + 3); name = u_signal_names(0, &i, 1);
if(name)
printf(snlfmt, name);
} }
return 0; return 0;
} }
signo = atoi(*argptr); name = u_signal_names(*argptr, &signo, -1);
if (signo > 128) if (name)
signo -= 128; printf(snlfmt, name);
if (0 < signo && signo < NSIG)
printf(snlfmt, signal_names[signo] + 3);
else else
error("invalid signal number or exit status: %s", error("invalid signal number or exit status: %s",
*argptr); *argptr);
@ -8834,12 +8766,6 @@ copynodelist(const struct nodelist *lp)
static char * static char *
nodesavestr(const char *s) nodesavestr(const char *s)
{ {
#ifdef _GNU_SOURCE
char *rtn = funcstring;
funcstring = stpcpy(funcstring, s) + 1;
return rtn;
#else
const char *p = s; const char *p = s;
char *q = funcstring; char *q = funcstring;
char *rtn = funcstring; char *rtn = funcstring;
@ -8848,7 +8774,6 @@ nodesavestr(const char *s)
continue; continue;
funcstring = q; funcstring = q;
return rtn; return rtn;
#endif
} }
#ifdef ASH_GETOPTS #ifdef ASH_GETOPTS
@ -12052,11 +11977,15 @@ trapcmd(argc, argv)
for (signo = 0 ; signo < NSIG ; signo++) { for (signo = 0 ; signo < NSIG ; signo++) {
if (trap[signo] != NULL) { if (trap[signo] != NULL) {
char *p; char *p;
const char *sn;
p = single_quote(trap[signo]); p = single_quote(trap[signo]);
printf("trap -- %s %s\n", p, sn = sys_siglist[signo];
signal_names[signo] + (signo ? 3 : 0) if(sn==NULL)
); sn = u_signal_names(0, &signo, 0);
if(sn==NULL)
sn = "???";
printf("trap -- %s %s\n", p, sn);
stunalloc(p); stunalloc(p);
} }
} }
@ -12273,30 +12202,11 @@ l2: _exit(status);
static int decode_signal(const char *string, int minsig) static int decode_signal(const char *string, int minsig)
{ {
int signo; int signo;
const char *name = u_signal_names(string, &signo, minsig);
if (is_number(string, &signo)) { return name ? signo : -1;
if (signo >= NSIG) {
return -1;
}
return signo;
}
signo = minsig;
if (!signo) {
goto zero;
}
for (; signo < NSIG; signo++) {
if (!strcasecmp(string, &(signal_names[signo])[3])) {
return signo;
}
zero:
if (!strcasecmp(string, signal_names[signo])) {
return signo;
}
}
return -1;
} }
static struct var **hashvar (const char *); static struct var **hashvar (const char *);
static void showvars (const char *, int, int); static void showvars (const char *, int, int);
static struct var **findvar (struct var **, const char *); static struct var **findvar (struct var **, const char *);
@ -12616,6 +12526,7 @@ found:;
return 0; return 0;
} }
/* /*
* The "local" command. * The "local" command.
*/ */
@ -12874,7 +12785,7 @@ findvar(struct var **vpp, const char *name)
/* /*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org> * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin. * This file contains code for the times builtin.
* $Id: ash.c,v 1.16 2001/08/01 17:21:33 kraai Exp $ * $Id: ash.c,v 1.17 2001/08/02 05:02:45 andersen Exp $
*/ */
static int timescmd (int argc, char **argv) static int timescmd (int argc, char **argv)
{ {
@ -12894,24 +12805,32 @@ static int timescmd (int argc, char **argv)
return 0; return 0;
} }
#ifdef ASH_MATH_SUPPORT #ifdef ASH_MATH_SUPPORT
/* The let builtin. */ /* The let builtin. */
int letcmd(int argc, char **argv) int letcmd(int argc, char **argv)
{ {
int errcode;
long result=0; long result=0;
if (argc == 2) { if (argc == 2) {
char *tmp, *expression, p[13]; char *tmp, *expression, p[13];
expression = strchr(argv[1], '='); expression = strchr(argv[1], '=');
if (!expression) { if (!expression) {
/* Cannot use 'error()' here, or the return code
* will be incorrect */
out2fmt("sh: let: syntax error: \"%s\"\n", argv[1]); out2fmt("sh: let: syntax error: \"%s\"\n", argv[1]);
return 0; return 0;
} }
*expression = '\0'; *expression = '\0';
tmp = ++expression; tmp = ++expression;
result = arith(tmp); result = arith(tmp, &errcode);
if (result < 0) { if (errcode < 0) {
out2fmt("sh: let: syntax error: \"%s=%s\"\n", argv[1], expression); /* Cannot use 'error()' here, or the return code
* will be incorrect */
out2fmt("sh: let: ");
if(errcode == -2)
out2fmt("divide by zero");
else
out2fmt("syntax error: \"%s=%s\"\n", argv[1], expression);
return 0; return 0;
} }
snprintf(p, 12, "%ld", result); snprintf(p, 12, "%ld", result);

24
cmdedit.c
View File

@ -1167,25 +1167,21 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
len = 0; len = 0;
command_ps = command; command_ps = command;
if (new_settings.c_cc[VERASE] == 0) { /* first call */ getTermSettings(0, (void *) &initial_settings);
memcpy(&new_settings, &initial_settings, sizeof(struct termios));
getTermSettings(0, (void *) &initial_settings); new_settings.c_lflag &= ~ICANON; /* unbuffered input */
memcpy(&new_settings, &initial_settings, sizeof(struct termios)); /* Turn off echoing and CTRL-C, so we can trap it */
new_settings.c_lflag &= ~ICANON; /* unbuffered input */ new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
/* Turn off echoing and CTRL-C, so we can trap it */
new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
#ifndef linux #ifndef linux
/* Hmm, in linux c_cc[] not parsed if set ~ICANON */ /* Hmm, in linux c_cc[] not parsed if set ~ICANON */
new_settings.c_cc[VMIN] = 1; new_settings.c_cc[VMIN] = 1;
new_settings.c_cc[VTIME] = 0; new_settings.c_cc[VTIME] = 0;
/* Turn off CTRL-C, so we can trap it */ /* Turn off CTRL-C, so we can trap it */
# ifndef _POSIX_VDISABLE # ifndef _POSIX_VDISABLE
# define _POSIX_VDISABLE '\0' # define _POSIX_VDISABLE '\0'
# endif # endif
new_settings.c_cc[VINTR] = _POSIX_VDISABLE; new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
#endif #endif
}
command[0] = 0; command[0] = 0;
setTermSettings(0, (void *) &new_settings); setTermSettings(0, (void *) &new_settings);

6
coreutils/cut.c
View File

@ -344,10 +344,8 @@ extern int cut_main(int argc, char **argv)
int i; int i;
FILE *file; FILE *file;
for (i = optind; i < argc; i++) { for (i = optind; i < argc; i++) {
file = fopen(argv[i], "r"); file = wfopen(argv[i], "r");
if (file == NULL) { if(file) {
perror_msg("%s", argv[i]);
} else {
cut_file(file); cut_file(file);
fclose(file); fclose(file);
} }

10
coreutils/uudecode.c
View File

@ -201,9 +201,8 @@ static int decode (const char *inname,
const char *forced_outname) const char *forced_outname)
{ {
struct passwd *pw; struct passwd *pw;
register int n;
register char *p; register char *p;
int mode, n1; int mode;
char buf[2 * BUFSIZ]; char buf[2 * BUFSIZ];
char *outname; char *outname;
int do_base64 = 0; int do_base64 = 0;
@ -249,12 +248,7 @@ static int decode (const char *inname,
error_msg("%s: No user `%s'", inname, buf + 1); error_msg("%s: No user `%s'", inname, buf + 1);
return FALSE; return FALSE;
} }
n = strlen (pw->pw_dir); outname = concat_path_file(pw->pw_dir, p);
n1 = strlen (p);
outname = (char *) xmalloc ((size_t) (n + n1 + 2));
memcpy (outname + n + 1, p, (size_t) (n1 + 1));
memcpy (outname, pw->pw_dir, (size_t) n);
outname[n] = '/';
dofre = TRUE; dofre = TRUE;
} }
} }

6
cut.c
View File

@ -344,10 +344,8 @@ extern int cut_main(int argc, char **argv)
int i; int i;
FILE *file; FILE *file;
for (i = optind; i < argc; i++) { for (i = optind; i < argc; i++) {
file = fopen(argv[i], "r"); file = wfopen(argv[i], "r");
if (file == NULL) { if(file) {
perror_msg("%s", argv[i]);
} else {
cut_file(file); cut_file(file);
fclose(file); fclose(file);
} }

4
include/libbb.h
View File

@ -212,7 +212,7 @@ char *xreadlink(const char *path);
char *concat_path_file(const char *path, const char *filename); char *concat_path_file(const char *path, const char *filename);
char *last_char_is(const char *s, int c); char *last_char_is(const char *s, int c);
extern long arith (const char *startbuf); extern long arith (const char *startbuf, int *errcode);
typedef struct file_headers_s { typedef struct file_headers_s {
char *name; char *name;
@ -261,6 +261,8 @@ char *dirname (const char *path);
int make_directory (char *path, mode_t mode, int flags); int make_directory (char *path, mode_t mode, int flags);
const char *u_signal_names(const char *str_sig, int *signo, int startnum);
#define CT_AUTO 0 #define CT_AUTO 0
#define CT_UNIX2DOS 1 #define CT_UNIX2DOS 1
#define CT_DOS2UNIX 2 #define CT_DOS2UNIX 2

142
kill.c
View File

@ -34,96 +34,11 @@
static const int KILL = 0; static const int KILL = 0;
static const int KILLALL = 1; static const int KILLALL = 1;
struct signal_name {
const char *name;
int number;
};
static const struct signal_name signames[] = {
/* POSIX signals */
{ "HUP", SIGHUP }, /* 1 */
{ "INT", SIGINT }, /* 2 */
{ "QUIT", SIGQUIT }, /* 3 */
{ "ILL", SIGILL }, /* 4 */
{ "ABRT", SIGABRT }, /* 6 */
{ "FPE", SIGFPE }, /* 8 */
{ "KILL", SIGKILL }, /* 9 */
{ "SEGV", SIGSEGV }, /* 11 */
{ "PIPE", SIGPIPE }, /* 13 */
{ "ALRM", SIGALRM }, /* 14 */
{ "TERM", SIGTERM }, /* 15 */
{ "USR1", SIGUSR1 }, /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */
{ "USR2", SIGUSR2 }, /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */
{ "CHLD", SIGCHLD }, /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */
{ "CONT", SIGCONT }, /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */
{ "STOP", SIGSTOP }, /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */
{ "TSTP", SIGTSTP }, /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */
{ "TTIN", SIGTTIN }, /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */
{ "TTOU", SIGTTOU }, /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */
/* Miscellaneous other signals */
#ifdef SIGTRAP
{ "TRAP", SIGTRAP }, /* 5 */
#endif
#ifdef SIGIOT
{ "IOT", SIGIOT }, /* 6, same as SIGABRT */
#endif
#ifdef SIGEMT
{ "EMT", SIGEMT }, /* 7 (mips,alpha,sparc*) */
#endif
#ifdef SIGBUS
{ "BUS", SIGBUS }, /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */
#endif
#ifdef SIGSYS
{ "SYS", SIGSYS }, /* 12 (mips,alpha,sparc*) */
#endif
#ifdef SIGSTKFLT
{ "STKFLT", SIGSTKFLT }, /* 16 (arm,i386,m68k,ppc) */
#endif
#ifdef SIGURG
{ "URG", SIGURG }, /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */
#endif
#ifdef SIGIO
{ "IO", SIGIO }, /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */
#endif
#ifdef SIGPOLL
{ "POLL", SIGPOLL }, /* same as SIGIO */
#endif
#ifdef SIGCLD
{ "CLD", SIGCLD }, /* same as SIGCHLD (mips) */
#endif
#ifdef SIGXCPU
{ "XCPU", SIGXCPU }, /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */
#endif
#ifdef SIGXFSZ
{ "XFSZ", SIGXFSZ }, /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */
#endif
#ifdef SIGVTALRM
{ "VTALRM", SIGVTALRM }, /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */
#endif
#ifdef SIGPROF
{ "PROF", SIGPROF }, /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */
#endif
#ifdef SIGPWR
{ "PWR", SIGPWR }, /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */
#endif
#ifdef SIGINFO
{ "INFO", SIGINFO }, /* 29 (alpha) */
#endif
#ifdef SIGLOST
{ "LOST", SIGLOST }, /* 29 (arm,i386,m68k,ppc,sparc*) */
#endif
#ifdef SIGWINCH
{ "WINCH", SIGWINCH }, /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */
#endif
#ifdef SIGUNUSED
{ "UNUSED", SIGUNUSED }, /* 31 (arm,i386,m68k,ppc) */
#endif
{0, 0}
};
extern int kill_main(int argc, char **argv) extern int kill_main(int argc, char **argv)
{ {
int whichApp, sig = SIGTERM; int whichApp, sig = SIGTERM;
const char *name;
#ifdef BB_KILLALL #ifdef BB_KILLALL
/* Figure out what we are trying to do here */ /* Figure out what we are trying to do here */
@ -142,52 +57,37 @@ extern int kill_main(int argc, char **argv)
while (*++(*argv)) { while (*++(*argv)) {
switch (**argv) { switch (**argv) {
case 'l': case 'l':
{ if(argc>1) {
for(argv++; *argv; argv++) {
name = u_signal_names(*argv, &sig, -1);
if(name!=NULL)
printf("%s\n", name);
}
} else {
int col = 0; int col = 0;
const struct signal_name *s = signames; for(sig=1; sig < NSIG; sig++) {
name = u_signal_names(0, &sig, 1);
while (s->name != 0) { if(name==NULL) /* unnamed */
col += fprintf(stderr, "%2d) %-8s", s->number, s->name); continue;
s++; col += printf("%2d) %-16s", sig, name);
if (col > 60) { if (col > 60) {
fprintf(stderr, "\n"); printf("\n");
col = 0; col = 0;
} }
} }
fprintf(stderr, "\n\n"); printf("\n");
return EXIT_SUCCESS;
} }
break; return EXIT_SUCCESS;
case '-': case '-':
show_usage(); show_usage();
default: default:
{ name = u_signal_names(*argv, &sig, 0);
if (isdigit(**argv)) { if(name==NULL)
sig = atoi(*argv); error_msg_and_die( "bad signal name: %s", *argv);
if (sig < 0 || sig >= NSIG)
goto end;
else {
argc--;
argv++;
goto do_it_now;
}
} else {
const struct signal_name *s = signames;
while (s->name != 0) {
if (strcasecmp(s->name, *argv) == 0) {
sig = s->number;
argc--; argc--;
argv++; argv++;
goto do_it_now; goto do_it_now;
} }
s++;
}
if (s->name == 0)
goto end;
}
}
}
argc--; argc--;
argv++; argv++;
} }
@ -239,8 +139,4 @@ extern int kill_main(int argc, char **argv)
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
end:
error_msg_and_die( "bad signal name: %s", *argv);
} }

33
libbb/arith.c
View File

@ -119,20 +119,26 @@ static short arith_apply(operator op, long *numstack, long **numstackptr)
NUMPTR[-1] = (NUMPTR[-1] <= *NUMPTR); NUMPTR[-1] = (NUMPTR[-1] <= *NUMPTR);
else if (op == TOK_MUL) else if (op == TOK_MUL)
NUMPTR[-1] *= *NUMPTR; NUMPTR[-1] *= *NUMPTR;
else if (op == TOK_DIV) else if (op == TOK_DIV) {
if(*NUMPTR==0)
return -2;
NUMPTR[-1] /= *NUMPTR; NUMPTR[-1] /= *NUMPTR;
else if (op == TOK_REM) }
else if (op == TOK_REM) {
if(*NUMPTR==0)
return -2;
NUMPTR[-1] %= *NUMPTR; NUMPTR[-1] %= *NUMPTR;
}
else if (op == TOK_ADD) else if (op == TOK_ADD)
NUMPTR[-1] += *NUMPTR; NUMPTR[-1] += *NUMPTR;
else if (op == TOK_SUB) else if (op == TOK_SUB)
NUMPTR[-1] -= *NUMPTR; NUMPTR[-1] -= *NUMPTR;
} }
return 0; return 0;
err: return(1); err: return(-1);
} }
extern long arith (const char *startbuf) extern long arith (const char *startbuf, int *errcode)
{ {
register char arithval; register char arithval;
const char *expr = startbuf; const char *expr = startbuf;
@ -142,8 +148,9 @@ extern long arith (const char *startbuf)
unsigned char prec; unsigned char prec;
long *numstack, *numstackptr; long *numstack, *numstackptr;
operator *stack = alloca(datasizes * sizeof(operator)), *stackptr = stack; operator *stack = alloca(datasizes * sizeof(operator)), *stackptr = stack;
*errcode = 0;
numstack = alloca((datasizes/2+1)*sizeof(long)), numstackptr = numstack; numstack = alloca((datasizes/2+1)*sizeof(long)), numstackptr = numstack;
while ((arithval = *expr)) { while ((arithval = *expr)) {
@ -163,7 +170,8 @@ extern long arith (const char *startbuf)
op = *--stackptr; op = *--stackptr;
if (op == TOK_LPAREN) if (op == TOK_LPAREN)
goto prologue; goto prologue;
if(ARITH_APPLY(op)) goto err; *errcode = ARITH_APPLY(op);
if(*errcode) return *errcode;
} }
goto err; /* Mismatched parens */ goto err; /* Mismatched parens */
} if (arithval == '|') { } if (arithval == '|') {
@ -231,17 +239,22 @@ extern long arith (const char *startbuf)
prec = PREC(op); prec = PREC(op);
if (prec != UNARYPREC) if (prec != UNARYPREC)
while (stackptr != stack && PREC(stackptr[-1]) >= prec) while (stackptr != stack && PREC(stackptr[-1]) >= prec) {
if(ARITH_APPLY(*--stackptr)) goto err; *errcode = ARITH_APPLY(*--stackptr);
if(*errcode) return *errcode;
}
*stackptr++ = op; *stackptr++ = op;
lasttok = op; lasttok = op;
prologue: ++expr; prologue: ++expr;
} /* yay */ } /* yay */
while (stackptr != stack) while (stackptr != stack) {
if(ARITH_APPLY(*--stackptr)) goto err; *errcode = ARITH_APPLY(*--stackptr);
if(*errcode) return *errcode;
}
if (numstackptr != numstack+1) { if (numstackptr != numstack+1) {
err: err:
*errcode = -1;
return -1; return -1;
/* NOTREACHED */ /* NOTREACHED */
} }

2
libbb/concat_path_file.c
View File

@ -17,7 +17,7 @@ extern char *concat_path_file(const char *path, const char *filename)
if (!path) if (!path)
path=""; path="";
lc = last_char_is(path, '/'); lc = last_char_is(path, '/');
if (filename[0] == '/') while (*filename == '/')
filename++; filename++;
outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename); sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);

4
libbb/libbb.h
View File

@ -212,7 +212,7 @@ char *xreadlink(const char *path);
char *concat_path_file(const char *path, const char *filename); char *concat_path_file(const char *path, const char *filename);
char *last_char_is(const char *s, int c); char *last_char_is(const char *s, int c);
extern long arith (const char *startbuf); extern long arith (const char *startbuf, int *errcode);
typedef struct file_headers_s { typedef struct file_headers_s {
char *name; char *name;
@ -261,6 +261,8 @@ char *dirname (const char *path);
int make_directory (char *path, mode_t mode, int flags); int make_directory (char *path, mode_t mode, int flags);
const char *u_signal_names(const char *str_sig, int *signo, int startnum);
#define CT_AUTO 0 #define CT_AUTO 0
#define CT_UNIX2DOS 1 #define CT_UNIX2DOS 1
#define CT_DOS2UNIX 2 #define CT_DOS2UNIX 2

3
miscutils/update.c
View File

@ -69,9 +69,6 @@ extern int update_main(int argc, char **argv)
if (daemon(0, 1) < 0) if (daemon(0, 1) < 0)
perror_msg_and_die("daemon"); perror_msg_and_die("daemon");
/* Become a proper daemon */
setsid();
chdir("/");
#ifdef OPEN_MAX #ifdef OPEN_MAX
for (pid = 0; pid < OPEN_MAX; pid++) close(pid); for (pid = 0; pid < OPEN_MAX; pid++) close(pid);
#else #else

142
procps/kill.c
View File

@ -34,96 +34,11 @@
static const int KILL = 0; static const int KILL = 0;
static const int KILLALL = 1; static const int KILLALL = 1;
struct signal_name {
const char *name;
int number;
};
static const struct signal_name signames[] = {
/* POSIX signals */
{ "HUP", SIGHUP }, /* 1 */
{ "INT", SIGINT }, /* 2 */
{ "QUIT", SIGQUIT }, /* 3 */
{ "ILL", SIGILL }, /* 4 */
{ "ABRT", SIGABRT }, /* 6 */
{ "FPE", SIGFPE }, /* 8 */
{ "KILL", SIGKILL }, /* 9 */
{ "SEGV", SIGSEGV }, /* 11 */
{ "PIPE", SIGPIPE }, /* 13 */
{ "ALRM", SIGALRM }, /* 14 */
{ "TERM", SIGTERM }, /* 15 */
{ "USR1", SIGUSR1 }, /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */
{ "USR2", SIGUSR2 }, /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */
{ "CHLD", SIGCHLD }, /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */
{ "CONT", SIGCONT }, /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */
{ "STOP", SIGSTOP }, /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */
{ "TSTP", SIGTSTP }, /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */
{ "TTIN", SIGTTIN }, /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */
{ "TTOU", SIGTTOU }, /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */
/* Miscellaneous other signals */
#ifdef SIGTRAP
{ "TRAP", SIGTRAP }, /* 5 */
#endif
#ifdef SIGIOT
{ "IOT", SIGIOT }, /* 6, same as SIGABRT */
#endif
#ifdef SIGEMT
{ "EMT", SIGEMT }, /* 7 (mips,alpha,sparc*) */
#endif
#ifdef SIGBUS
{ "BUS", SIGBUS }, /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */
#endif
#ifdef SIGSYS
{ "SYS", SIGSYS }, /* 12 (mips,alpha,sparc*) */
#endif
#ifdef SIGSTKFLT
{ "STKFLT", SIGSTKFLT }, /* 16 (arm,i386,m68k,ppc) */
#endif
#ifdef SIGURG
{ "URG", SIGURG }, /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */
#endif
#ifdef SIGIO
{ "IO", SIGIO }, /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */
#endif
#ifdef SIGPOLL
{ "POLL", SIGPOLL }, /* same as SIGIO */
#endif
#ifdef SIGCLD
{ "CLD", SIGCLD }, /* same as SIGCHLD (mips) */
#endif
#ifdef SIGXCPU
{ "XCPU", SIGXCPU }, /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */
#endif
#ifdef SIGXFSZ
{ "XFSZ", SIGXFSZ }, /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */
#endif
#ifdef SIGVTALRM
{ "VTALRM", SIGVTALRM }, /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */
#endif
#ifdef SIGPROF
{ "PROF", SIGPROF }, /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */
#endif
#ifdef SIGPWR
{ "PWR", SIGPWR }, /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */
#endif
#ifdef SIGINFO
{ "INFO", SIGINFO }, /* 29 (alpha) */
#endif
#ifdef SIGLOST
{ "LOST", SIGLOST }, /* 29 (arm,i386,m68k,ppc,sparc*) */
#endif
#ifdef SIGWINCH
{ "WINCH", SIGWINCH }, /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */
#endif
#ifdef SIGUNUSED
{ "UNUSED", SIGUNUSED }, /* 31 (arm,i386,m68k,ppc) */
#endif
{0, 0}
};
extern int kill_main(int argc, char **argv) extern int kill_main(int argc, char **argv)
{ {
int whichApp, sig = SIGTERM; int whichApp, sig = SIGTERM;
const char *name;
#ifdef BB_KILLALL #ifdef BB_KILLALL
/* Figure out what we are trying to do here */ /* Figure out what we are trying to do here */
@ -142,52 +57,37 @@ extern int kill_main(int argc, char **argv)
while (*++(*argv)) { while (*++(*argv)) {
switch (**argv) { switch (**argv) {
case 'l': case 'l':
{ if(argc>1) {
for(argv++; *argv; argv++) {
name = u_signal_names(*argv, &sig, -1);
if(name!=NULL)
printf("%s\n", name);
}
} else {
int col = 0; int col = 0;
const struct signal_name *s = signames; for(sig=1; sig < NSIG; sig++) {
name = u_signal_names(0, &sig, 1);
while (s->name != 0) { if(name==NULL) /* unnamed */
col += fprintf(stderr, "%2d) %-8s", s->number, s->name); continue;
s++; col += printf("%2d) %-16s", sig, name);
if (col > 60) { if (col > 60) {
fprintf(stderr, "\n"); printf("\n");
col = 0; col = 0;
} }
} }
fprintf(stderr, "\n\n"); printf("\n");
return EXIT_SUCCESS;
} }
break; return EXIT_SUCCESS;
case '-': case '-':
show_usage(); show_usage();
default: default:
{ name = u_signal_names(*argv, &sig, 0);
if (isdigit(**argv)) { if(name==NULL)
sig = atoi(*argv); error_msg_and_die( "bad signal name: %s", *argv);
if (sig < 0 || sig >= NSIG)
goto end;
else {
argc--;
argv++;
goto do_it_now;
}
} else {
const struct signal_name *s = signames;
while (s->name != 0) {
if (strcasecmp(s->name, *argv) == 0) {
sig = s->number;
argc--; argc--;
argv++; argv++;
goto do_it_now; goto do_it_now;
} }
s++;
}
if (s->name == 0)
goto end;
}
}
}
argc--; argc--;
argv++; argv++;
} }
@ -239,8 +139,4 @@ extern int kill_main(int argc, char **argv)
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
end:
error_msg_and_die( "bad signal name: %s", *argv);
} }

171
shell/ash.c
View File

@ -52,6 +52,7 @@
/* If you need ash to act as a full Posix shell, with full math /* If you need ash to act as a full Posix shell, with full math
* support, enable this. This adds a bit over 2k an x86 system. */ * support, enable this. This adds a bit over 2k an x86 system. */
//#undef ASH_MATH_SUPPORT
#define ASH_MATH_SUPPORT #define ASH_MATH_SUPPORT
/* Getopts is used by shell procedures to parse positional parameters. /* Getopts is used by shell procedures to parse positional parameters.
@ -78,8 +79,6 @@
/* These are here to work with glibc -- Don't change these... */ /* These are here to work with glibc -- Don't change these... */
#undef FNMATCH_BROKEN #undef FNMATCH_BROKEN
#undef GLOB_BROKEN #undef GLOB_BROKEN
#undef _GNU_SOURCE
#undef __USE_GNU
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
@ -4839,6 +4838,7 @@ static void
expari(int flag) expari(int flag)
{ {
char *p, *start; char *p, *start;
int errcode;
int result; int result;
int begoff; int begoff;
int quotes = flag & (EXP_FULL | EXP_CASE); int quotes = flag & (EXP_FULL | EXP_CASE);
@ -4877,9 +4877,13 @@ expari(int flag)
removerecordregions(begoff); removerecordregions(begoff);
if (quotes) if (quotes)
rmescapes(p+2); rmescapes(p+2);
result = arith(p+2); result = arith(p+2, &errcode);
if (result < 0) if (errcode < 0) {
error("arith: syntax error: \"%s\"\n", p+2); if(errcode == -2)
error("divide by zero");
else
error("syntax error: \"%s\"\n", p+2);
}
snprintf(p, 12, "%d", result); snprintf(p, 12, "%d", result);
while (*p++) while (*p++)
@ -5429,9 +5433,9 @@ expandmeta(str, flag)
goto nometa; goto nometa;
p = preglob(str->text); p = preglob(str->text);
INTOFF; INTOFF;
switch (glob(p, GLOB_NOMAGIC, 0, &pglob)) { switch (glob(p, 0, 0, &pglob)) {
case 0: case 0:
if (!(pglob.gl_flags & GLOB_MAGCHAR)) if(pglob.gl_pathv[1]==0 && !strcmp(p, pglob.gl_pathv[0]))
goto nometa2; goto nometa2;
addglob(&pglob); addglob(&pglob);
globfree(&pglob); globfree(&pglob);
@ -6006,7 +6010,7 @@ static int histcmd(argc, argv)
struct redirtab { struct redirtab {
struct redirtab *next; struct redirtab *next;
short renamed[10]; /* Current ash support only 0-9 descriptors */ short renamed[10]; /* Current ash support only 0-9 descriptors */
/* char renamed[10]; */ /* char on arm (and others) can't be negative */ /* char on arm (and others) can't be negative */
}; };
static struct redirtab *redirlist; static struct redirtab *redirlist;
@ -6166,7 +6170,7 @@ preadfd(void)
retry: retry:
#ifdef BB_FEATURE_COMMAND_EDITING #ifdef BB_FEATURE_COMMAND_EDITING
{ {
if (parsefile->fd) if (!iflag || parsefile->fd)
nr = safe_read(parsefile->fd, buf, BUFSIZ - 1); nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
else { else {
nr = cmdedit_read_input((char*)cmdedit_prompt, buf); nr = cmdedit_read_input((char*)cmdedit_prompt, buf);
@ -6468,80 +6472,6 @@ static void setjobctl(int enable)
#endif #endif
/* A translation list so we can be polite to our users. */
static char *signal_names[NSIG + 2] = {
"EXIT",
"SIGHUP",
"SIGINT",
"SIGQUIT",
"SIGILL",
"SIGTRAP",
"SIGABRT",
"SIGBUS",
"SIGFPE",
"SIGKILL",
"SIGUSR1",
"SIGSEGV",
"SIGUSR2",
"SIGPIPE",
"SIGALRM",
"SIGTERM",
"SIGJUNK(16)",
"SIGCHLD",
"SIGCONT",
"SIGSTOP",
"SIGTSTP",
"SIGTTIN",
"SIGTTOU",
"SIGURG",
"SIGXCPU",
"SIGXFSZ",
"SIGVTALRM",
"SIGPROF",
"SIGWINCH",
"SIGIO",
"SIGPWR",
"SIGSYS",
#ifdef SIGRTMIN
"SIGRTMIN",
"SIGRTMIN+1",
"SIGRTMIN+2",
"SIGRTMIN+3",
"SIGRTMIN+4",
"SIGRTMIN+5",
"SIGRTMIN+6",
"SIGRTMIN+7",
"SIGRTMIN+8",
"SIGRTMIN+9",
"SIGRTMIN+10",
"SIGRTMIN+11",
"SIGRTMIN+12",
"SIGRTMIN+13",
"SIGRTMIN+14",
"SIGRTMIN+15",
"SIGRTMAX-15",
"SIGRTMAX-14",
"SIGRTMAX-13",
"SIGRTMAX-12",
"SIGRTMAX-11",
"SIGRTMAX-10",
"SIGRTMAX-9",
"SIGRTMAX-8",
"SIGRTMAX-7",
"SIGRTMAX-6",
"SIGRTMAX-5",
"SIGRTMAX-4",
"SIGRTMAX-3",
"SIGRTMAX-2",
"SIGRTMAX-1",
"SIGRTMAX",
#endif
"DEBUG",
(char *)0x0,
};
#ifdef JOBS #ifdef JOBS
static int static int
killcmd(argc, argv) killcmd(argc, argv)
@ -6599,18 +6529,20 @@ usage:
} }
if (list) { if (list) {
const char *name;
if (!*argptr) { if (!*argptr) {
out1str("0\n"); out1str("0\n");
for (i = 1; i < NSIG; i++) { for (i = 1; i < NSIG; i++) {
printf(snlfmt, signal_names[i] + 3); name = u_signal_names(0, &i, 1);
if(name)
printf(snlfmt, name);
} }
return 0; return 0;
} }
signo = atoi(*argptr); name = u_signal_names(*argptr, &signo, -1);
if (signo > 128) if (name)
signo -= 128; printf(snlfmt, name);
if (0 < signo && signo < NSIG)
printf(snlfmt, signal_names[signo] + 3);
else else
error("invalid signal number or exit status: %s", error("invalid signal number or exit status: %s",
*argptr); *argptr);
@ -8834,12 +8766,6 @@ copynodelist(const struct nodelist *lp)
static char * static char *
nodesavestr(const char *s) nodesavestr(const char *s)
{ {
#ifdef _GNU_SOURCE
char *rtn = funcstring;
funcstring = stpcpy(funcstring, s) + 1;
return rtn;
#else
const char *p = s; const char *p = s;
char *q = funcstring; char *q = funcstring;
char *rtn = funcstring; char *rtn = funcstring;
@ -8848,7 +8774,6 @@ nodesavestr(const char *s)
continue; continue;
funcstring = q; funcstring = q;
return rtn; return rtn;
#endif
} }
#ifdef ASH_GETOPTS #ifdef ASH_GETOPTS
@ -12052,11 +11977,15 @@ trapcmd(argc, argv)
for (signo = 0 ; signo < NSIG ; signo++) { for (signo = 0 ; signo < NSIG ; signo++) {
if (trap[signo] != NULL) { if (trap[signo] != NULL) {
char *p; char *p;
const char *sn;
p = single_quote(trap[signo]); p = single_quote(trap[signo]);
printf("trap -- %s %s\n", p, sn = sys_siglist[signo];
signal_names[signo] + (signo ? 3 : 0) if(sn==NULL)
); sn = u_signal_names(0, &signo, 0);
if(sn==NULL)
sn = "???";
printf("trap -- %s %s\n", p, sn);
stunalloc(p); stunalloc(p);
} }
} }
@ -12273,30 +12202,11 @@ l2: _exit(status);
static int decode_signal(const char *string, int minsig) static int decode_signal(const char *string, int minsig)
{ {
int signo; int signo;
const char *name = u_signal_names(string, &signo, minsig);
if (is_number(string, &signo)) { return name ? signo : -1;
if (signo >= NSIG) {
return -1;
}
return signo;
}
signo = minsig;
if (!signo) {
goto zero;
}
for (; signo < NSIG; signo++) {
if (!strcasecmp(string, &(signal_names[signo])[3])) {
return signo;
}
zero:
if (!strcasecmp(string, signal_names[signo])) {
return signo;
}
}
return -1;
} }
static struct var **hashvar (const char *); static struct var **hashvar (const char *);
static void showvars (const char *, int, int); static void showvars (const char *, int, int);
static struct var **findvar (struct var **, const char *); static struct var **findvar (struct var **, const char *);
@ -12616,6 +12526,7 @@ found:;
return 0; return 0;
} }
/* /*
* The "local" command. * The "local" command.
*/ */
@ -12874,7 +12785,7 @@ findvar(struct var **vpp, const char *name)
/* /*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org> * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin. * This file contains code for the times builtin.
* $Id: ash.c,v 1.16 2001/08/01 17:21:33 kraai Exp $ * $Id: ash.c,v 1.17 2001/08/02 05:02:45 andersen Exp $
*/ */
static int timescmd (int argc, char **argv) static int timescmd (int argc, char **argv)
{ {
@ -12894,24 +12805,32 @@ static int timescmd (int argc, char **argv)
return 0; return 0;
} }
#ifdef ASH_MATH_SUPPORT #ifdef ASH_MATH_SUPPORT
/* The let builtin. */ /* The let builtin. */
int letcmd(int argc, char **argv) int letcmd(int argc, char **argv)
{ {
int errcode;
long result=0; long result=0;
if (argc == 2) { if (argc == 2) {
char *tmp, *expression, p[13]; char *tmp, *expression, p[13];
expression = strchr(argv[1], '='); expression = strchr(argv[1], '=');
if (!expression) { if (!expression) {
/* Cannot use 'error()' here, or the return code
* will be incorrect */
out2fmt("sh: let: syntax error: \"%s\"\n", argv[1]); out2fmt("sh: let: syntax error: \"%s\"\n", argv[1]);
return 0; return 0;
} }
*expression = '\0'; *expression = '\0';
tmp = ++expression; tmp = ++expression;
result = arith(tmp); result = arith(tmp, &errcode);
if (result < 0) { if (errcode < 0) {
out2fmt("sh: let: syntax error: \"%s=%s\"\n", argv[1], expression); /* Cannot use 'error()' here, or the return code
* will be incorrect */
out2fmt("sh: let: ");
if(errcode == -2)
out2fmt("divide by zero");
else
out2fmt("syntax error: \"%s=%s\"\n", argv[1], expression);
return 0; return 0;
} }
snprintf(p, 12, "%ld", result); snprintf(p, 12, "%ld", result);

24
shell/cmdedit.c
View File

@ -1167,25 +1167,21 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
len = 0; len = 0;
command_ps = command; command_ps = command;
if (new_settings.c_cc[VERASE] == 0) { /* first call */ getTermSettings(0, (void *) &initial_settings);
memcpy(&new_settings, &initial_settings, sizeof(struct termios));
getTermSettings(0, (void *) &initial_settings); new_settings.c_lflag &= ~ICANON; /* unbuffered input */
memcpy(&new_settings, &initial_settings, sizeof(struct termios)); /* Turn off echoing and CTRL-C, so we can trap it */
new_settings.c_lflag &= ~ICANON; /* unbuffered input */ new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
/* Turn off echoing and CTRL-C, so we can trap it */
new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
#ifndef linux #ifndef linux
/* Hmm, in linux c_cc[] not parsed if set ~ICANON */ /* Hmm, in linux c_cc[] not parsed if set ~ICANON */
new_settings.c_cc[VMIN] = 1; new_settings.c_cc[VMIN] = 1;
new_settings.c_cc[VTIME] = 0; new_settings.c_cc[VTIME] = 0;
/* Turn off CTRL-C, so we can trap it */ /* Turn off CTRL-C, so we can trap it */
# ifndef _POSIX_VDISABLE # ifndef _POSIX_VDISABLE
# define _POSIX_VDISABLE '\0' # define _POSIX_VDISABLE '\0'
# endif # endif
new_settings.c_cc[VINTR] = _POSIX_VDISABLE; new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
#endif #endif
}
command[0] = 0; command[0] = 0;
setTermSettings(0, (void *) &new_settings); setTermSettings(0, (void *) &new_settings);

3
update.c
View File

@ -69,9 +69,6 @@ extern int update_main(int argc, char **argv)
if (daemon(0, 1) < 0) if (daemon(0, 1) < 0)
perror_msg_and_die("daemon"); perror_msg_and_die("daemon");
/* Become a proper daemon */
setsid();
chdir("/");
#ifdef OPEN_MAX #ifdef OPEN_MAX
for (pid = 0; pid < OPEN_MAX; pid++) close(pid); for (pid = 0; pid < OPEN_MAX; pid++) close(pid);
#else #else

10
uudecode.c
View File

@ -201,9 +201,8 @@ static int decode (const char *inname,
const char *forced_outname) const char *forced_outname)
{ {
struct passwd *pw; struct passwd *pw;
register int n;
register char *p; register char *p;
int mode, n1; int mode;
char buf[2 * BUFSIZ]; char buf[2 * BUFSIZ];
char *outname; char *outname;
int do_base64 = 0; int do_base64 = 0;
@ -249,12 +248,7 @@ static int decode (const char *inname,
error_msg("%s: No user `%s'", inname, buf + 1); error_msg("%s: No user `%s'", inname, buf + 1);
return FALSE; return FALSE;
} }
n = strlen (pw->pw_dir); outname = concat_path_file(pw->pw_dir, p);
n1 = strlen (p);
outname = (char *) xmalloc ((size_t) (n + n1 + 2));
memcpy (outname + n + 1, p, (size_t) (n1 + 1));
memcpy (outname, pw->pw_dir, (size_t) n);
outname[n] = '/';
dofre = TRUE; dofre = TRUE;
} }
} }