CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
endif
-all: busybox busybox.links
+all: busybox busybox.links docs
busybox: $(OBJECTS)
$(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
$(STRIP)
- $(MAKE) -C docs
+docs:
+ $(MAKE) -C docs
+
busybox.links: busybox.def.h
- ./busybox.mkll | sort >$@
-regexp.o nfsmount.o: %.o: %.h
+regexp.o nfsmount.o cmdedit.o: %.o: %.h
$(OBJECTS): %.o: busybox.def.h internal.h %.c Makefile
test tests:
len1=snprintf(buf, sizeof(buf), "%ld,%-ld ",
header.devmajor, header.devminor);
} else {
- len1=snprintf(buf, sizeof(buf), "%d ", header.size);
+ len1=snprintf(buf, sizeof(buf), "%lu ", (long)header.size);
}
/* Jump through some hoops to make the columns match up */
for(;(len+len1)<31;len++)
char* s, *s1;
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage("basename [file ...]\n");
+ usage("basename [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nStrips directory path and suffixes from FILE(s).\n"
+#endif
+ );
}
argv++;
// normal strings.
#define BB_FEATURE_FULL_REGULAR_EXPRESSIONS
//
-// Use only simple command help
-#define BB_FEATURE_TRIVIAL_HELP
+// This compiles out everything but the most
+// trivial --help usage information (i.e. reduces binary size)
+//#define BB_FEATURE_TRIVIAL_HELP
//
// Use termios to manipulate the screen ('more' is prettier with this on)
#define BB_FEATURE_USE_TERMIOS
}
if (**(argv + 1) == '-') {
- usage("cat [file ...]\n");
+ usage("cat [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nConcatenates FILE(s) and prints them to the standard output.\n"
+#endif
+ );
}
argc--;
#define CHOWN_APP 2
#define CHMOD_APP 3
-static const char chgrp_usage[] = "chgrp [OPTION]... GROUP FILE...\n\n"
- "Change the group membership of each FILE to GROUP.\n"
-
- "\nOptions:\n\t-R\tchange files and directories recursively\n";
+static const char chgrp_usage[] = "chgrp [OPTION]... GROUP FILE...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nChange the group membership of each FILE to GROUP.\n"
+ "\nOptions:\n\t-R\tChanges files and directories recursively.\n"
+#endif
+ ;
static const char chown_usage[] =
- "chown [OPTION]... OWNER[<.|:>[GROUP] FILE...\n\n"
- "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-
- "\nOptions:\n\t-R\tchange files and directories recursively\n";
+ "chown [OPTION]... OWNER[<.|:>[GROUP] FILE...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+ "\nOptions:\n\t-R\tChanges files and directories recursively.\n"
+#endif
+ ;
static const char chmod_usage[] =
- "chmod [-R] MODE[,MODE]... FILE...\n\n"
- "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-
+ "chmod [-R] MODE[,MODE]... FILE...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
"one or more of the letters rwxst.\n\n"
- "\nOptions:\n\t-R\tchange files and directories recursively.\n";
+ "\nOptions:\n\t-R\tChanges files and directories recursively.\n"
+#endif
+ ;
static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
#include <errno.h>
-static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n"
-
- "Run COMMAND with root directory set to NEWROOT.\n";
+static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nRun COMMAND with root directory set to NEWROOT.\n"
+#endif
+ ;
int fd, num;
if ((argc != 2) || (**(argv + 1) == '-')) {
- usage
- ("chvt N\n\nChange foreground virtual terminal to /dev/ttyN\n");
+ usage ("chvt N\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nChanges the foreground virtual terminal to /dev/ttyN\n"
+#endif
+ );
}
fd = get_console_fd("/dev/console");
num = atoi(argv[1]);
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <termio.h>
+#include <sys/ioctl.h>
#include <ctype.h>
#include <signal.h>
static struct history *his_front = NULL; /* First element in command line list */
static struct history *his_end = NULL; /* Last element in command line list */
-static struct termio old_term, new_term; /* Current termio and the previous termio before starting ash */
+
+/* ED: sparc termios is broken: revert back to old termio handling. */
+#ifdef BB_FEATURE_USE_TERMIOS
+
+#if #cpu(sparc)
+# include <termio.h>
+# define termios termio
+# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#else
+# include <termios.h>
+# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+# define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#endif
+
+/* Current termio and the previous termio before starting sh */
+struct termios initial_settings, new_settings;
+#endif
+
+
static int cmdedit_termw = 80; /* actual terminal width */
static int cmdedit_scroll = 27; /* width of EOL scrolling region */
{
if (reset_term)
/* sparc and other have broken termios support: use old termio handling. */
- ioctl(fileno(stdin), TCSETA, (void *) &old_term);
+ setTermSettings(fileno(stdin), (void*) &initial_settings);
}
void clean_up_and_die(int sig)
{
cmdedit_reset_term();
fprintf(stdout, "\n");
- exit(TRUE);
+ if (sig!=SIGINT)
+ exit(TRUE);
}
/* Go to HOME position */
return (matches);
}
-void input_tab(char* command, int outputFd, int *cursor, int *len)
+void input_tab(char* command, char* prompt, int outputFd, int *cursor, int *len)
{
/* Do TAB completion */
static int num_matches=0;
memset(command, 0, sizeof(command));
if (!reset_term) {
- /* sparc and other have broken termios support: use old termio handling. */
- ioctl(inputFd, TCGETA, (void *) &old_term);
- memcpy(&new_term, &old_term, sizeof(struct termio));
-
- new_term.c_cc[VMIN] = 1;
- new_term.c_cc[VTIME] = 0;
- new_term.c_lflag &= ~ICANON; /* unbuffered input */
- new_term.c_lflag &= ~ECHO;
+
+ getTermSettings(inputFd, (void*) &initial_settings);
+ memcpy(&new_settings, &initial_settings, sizeof(struct termios));
+ new_settings.c_cc[VMIN] = 1;
+ new_settings.c_cc[VTIME] = 0;
+ new_settings.c_cc[VINTR] = _POSIX_VDISABLE; /* Turn off CTRL-C, so we can trap it */
+ new_settings.c_lflag &= ~ICANON; /* unbuffered input */
+ new_settings.c_lflag &= ~(ECHO|ECHOCTL|ECHONL); /* Turn off echoing */
reset_term = 1;
- ioctl(inputFd, TCSETA, (void *) &new_term);
- } else {
- ioctl(inputFd, TCSETA, (void *) &new_term);
}
+ setTermSettings(inputFd, (void*) &new_settings);
memset(command, 0, BUFSIZ);
if ((ret = read(inputFd, &c, 1)) < 1)
return;
+ //fprintf(stderr, "got a '%c' (%d)\n", c, c);
switch (c) {
case '\n':
case 2:
/* Control-b -- Move back one character */
input_backward(outputFd, &cursor);
+ break;
+ case 3:
+ /* Control-c -- leave the current line,
+ * and start over on the next line */
+
+ /* Go to the next line */
+ xwrite(outputFd, "\n", 1);
+
+ /* Rewrite the prompt */
+ xwrite(outputFd, prompt, strlen(prompt));
+
+ /* Reset the command string */
+ memset(command, 0, sizeof(command));
+ len = cursor = 0;
+
break;
case 4:
/* Control-d -- Delete one character, or exit
break;
case '\b':
case DEL:
- /* control-h and DEL */
+ /* Control-h and DEL */
input_backspace(command, outputFd, &cursor, &len);
break;
case '\t':
#ifdef BB_FEATURE_SH_TAB_COMPLETION
- input_tab(command, outputFd, &cursor, &len);
+ input_tab(command, prompt, outputFd, &cursor, &len);
#endif
break;
case 14:
}
nr = len + 1;
- /* sparc and other have broken termios support: use old termio handling. */
- ioctl(inputFd, TCSETA, (void *) &old_term);
+ setTermSettings(inputFd, (void *) &initial_settings);
reset_term = 0;
extern void cmdedit_init(void)
{
atexit(cmdedit_reset_term);
+ signal(SIGKILL, clean_up_and_die);
signal(SIGINT, clean_up_and_die);
signal(SIGQUIT, clean_up_and_die);
signal(SIGTERM, clean_up_and_die);
typedef size_t (*cmdedit_strwidth_proc)(char *);
+void cmdedit_init(void);
void cmdedit_read_input(char* promptStr, char* command); /* read a line of input */
void cmdedit_setwidth(int); /* specify width of screen */
void cmdedit_histadd(char *); /* adds entries to hist */
#else /* not __STDC__ */
+void cmdedit_init(void);
void cmdedit_read_input(char* promptStr, char* command);
void cmdedit_setwidth();
void cmdedit_histadd();
int fd, num;
if ((argc != 2) || (**(argv + 1) == '-')) {
- usage
- ("chvt N\n\nChange foreground virtual terminal to /dev/ttyN\n");
+ usage ("chvt N\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nChanges the foreground virtual terminal to /dev/ttyN\n"
+#endif
+ );
}
fd = get_console_fd("/dev/console");
num = atoi(argv[1]);
char* s, *s1;
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage("basename [file ...]\n");
+ usage("basename [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nStrips directory path and suffixes from FILE(s).\n"
+#endif
+ );
}
argv++;
}
if (**(argv + 1) == '-') {
- usage("cat [file ...]\n");
+ usage("cat [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nConcatenates FILE(s) and prints them to the standard output.\n"
+#endif
+ );
}
argc--;
#include <errno.h>
-static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n\n"
-
- "Run COMMAND with root directory set to NEWROOT.\n";
+static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nRun COMMAND with root directory set to NEWROOT.\n"
+#endif
+ ;
mail commands */
static const char date_usage[] = "date [OPTION]... [+FORMAT]\n"
- " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n"
- "Display the current time in the given FORMAT, or set the system date.\n"
- "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n"
- "\t-s\t\tset time described by STRING\n"
-
- "\t-u\t\tprint or set Coordinated Universal Time\n";
+ " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nDisplays the current time in the given FORMAT, or sets the system date.\n"
+ "\nOptions:\n\t-R\tOutputs RFC-822 compliant date string\n"
+ "\t-s\tSets time described by STRING\n"
+ "\t-u\tPrints or sets Coordinated Universal Time\n"
+#endif
+ ;
/* Input parsing code is always bulky - used heavy duty libc stuff as
if (argc != 2 || **(argv + 1) == '-') {
usage("length string\n");
}
- printf("%d\n", strlen(argv[1]));
+ printf("%lu\n", (long)strlen(argv[1]));
return (TRUE);
}
static const char *cp_mv_usage[] = /* .rodata */
{
"cp [OPTION]... SOURCE DEST\n"
- " or: cp [OPTION]... SOURCE... DIRECTORY\n\n"
- "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
+ " or: cp [OPTION]... SOURCE... DIRECTORY\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
"\n"
- "\t-a\tsame as -dpR\n"
- "\t-d\tpreserve links\n"
- "\t-p\tpreserve file attributes if possible\n"
- "\t-R\tcopy directories recursively\n",
+ "\t-a\tSame as -dpR\n"
+ "\t-d\tPreserves links\n"
+ "\t-p\tPreserves file attributes if possible\n"
+ "\t-R\tCopies directories recursively\n"
+#endif
+ ,
"mv SOURCE DEST\n"
- " or: mv SOURCE... DIRECTORY\n\n"
- "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
+ " or: mv SOURCE... DIRECTORY\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
+#endif
};
static int recursiveFlag;
mail commands */
static const char date_usage[] = "date [OPTION]... [+FORMAT]\n"
- " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n\n"
- "Display the current time in the given FORMAT, or set the system date.\n"
- "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n"
- "\t-s\t\tset time described by STRING\n"
-
- "\t-u\t\tprint or set Coordinated Universal Time\n";
+ " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nDisplays the current time in the given FORMAT, or sets the system date.\n"
+ "\nOptions:\n\t-R\tOutputs RFC-822 compliant date string\n"
+ "\t-s\tSets time described by STRING\n"
+ "\t-u\tPrints or sets Coordinated Universal Time\n"
+#endif
+ ;
/* Input parsing code is always bulky - used heavy duty libc stuff as
}
}
+#define CTRLCHAR(ch) ((ch)&0x1f)
/* Set terminal settings to reasonable defaults */
void set_term(int fd)
tcgetattr(fd, &tty);
/* set control chars */
- tty.c_cc[VINTR] = 3; /* C-c */
- tty.c_cc[VQUIT] = 28; /* C-\ */
- tty.c_cc[VERASE] = 127; /* C-? */
- tty.c_cc[VKILL] = 21; /* C-u */
- tty.c_cc[VEOF] = 4; /* C-d */
- tty.c_cc[VSTART] = 17; /* C-q */
- tty.c_cc[VSTOP] = 19; /* C-s */
- tty.c_cc[VSUSP] = 26; /* C-z */
+ tty.c_cc[VINTR] = CTRLCHAR('C'); /* Ctrl-C */
+ tty.c_cc[VQUIT] = CTRLCHAR('\\'); /* Ctrl-\ */
+ tty.c_cc[VERASE] = CTRLCHAR('?'); /* Ctrl-? */
+ tty.c_cc[VKILL] = CTRLCHAR('U'); /* Ctrl-U */
+ tty.c_cc[VEOF] = CTRLCHAR('D'); /* Ctrl-D */
+ tty.c_cc[VSTOP] = CTRLCHAR('S'); /* Ctrl-S */
+ tty.c_cc[VSTART] = CTRLCHAR('Q'); /* Ctrl-Q */
+ tty.c_cc[VSUSP] = CTRLCHAR('Z'); /* Ctrl-Z */
/* use line dicipline 0 */
tty.c_line = 0;
}
}
+#define CTRLCHAR(ch) ((ch)&0x1f)
/* Set terminal settings to reasonable defaults */
void set_term(int fd)
tcgetattr(fd, &tty);
/* set control chars */
- tty.c_cc[VINTR] = 3; /* C-c */
- tty.c_cc[VQUIT] = 28; /* C-\ */
- tty.c_cc[VERASE] = 127; /* C-? */
- tty.c_cc[VKILL] = 21; /* C-u */
- tty.c_cc[VEOF] = 4; /* C-d */
- tty.c_cc[VSTART] = 17; /* C-q */
- tty.c_cc[VSTOP] = 19; /* C-s */
- tty.c_cc[VSUSP] = 26; /* C-z */
+ tty.c_cc[VINTR] = CTRLCHAR('C'); /* Ctrl-C */
+ tty.c_cc[VQUIT] = CTRLCHAR('\\'); /* Ctrl-\ */
+ tty.c_cc[VERASE] = CTRLCHAR('?'); /* Ctrl-? */
+ tty.c_cc[VKILL] = CTRLCHAR('U'); /* Ctrl-U */
+ tty.c_cc[VEOF] = CTRLCHAR('D'); /* Ctrl-D */
+ tty.c_cc[VSTOP] = CTRLCHAR('S'); /* Ctrl-S */
+ tty.c_cc[VSTART] = CTRLCHAR('Q'); /* Ctrl-Q */
+ tty.c_cc[VSUSP] = CTRLCHAR('Z'); /* Ctrl-Z */
/* use line dicipline 0 */
tty.c_line = 0;
getcwd(cwd, sizeof(cwd));
#ifdef BB_FEATURE_SH_COMMAND_EDITING
+ cmdedit_init();
signal(SIGWINCH, win_changed);
win_changed(0);
#endif
if (argc != 2 || **(argv + 1) == '-') {
usage("length string\n");
}
- printf("%d\n", strlen(argv[1]));
+ printf("%lu\n", (long)strlen(argv[1]));
return (TRUE);
}
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
-#include <sys/syscall.h>
+#define __LIBRARY__
+#include <asm/unistd.h>
+/* #include <sys/syscall.h> */
static const char more_usage[] = "more [file ...]\n";
+/* ED: sparc termios is broken: revert back to old termio handling. */
#ifdef BB_FEATURE_USE_TERMIOS
-#include <termio.h>
+#if #cpu(sparc)
+# include <termio.h>
+# define termios termio
+# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#else
+# include <termios.h>
+# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+# define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#endif
FILE *cin;
-/* sparc and other have broken termios support: use old termio handling. */
-struct termio initial_settings, new_settings;
+struct termios initial_settings, new_settings;
void gotsig(int sig)
{
- ioctl(fileno(cin), TCSETAF, &initial_settings);
+ setTermSettings(fileno(cin), &initial_settings);
fprintf(stdout, "\n");
exit(TRUE);
}
cin = fopen("/dev/tty", "r");
if (!cin)
cin = fopen("/dev/console", "r");
- ioctl(fileno(cin), TCGETA, &initial_settings);
+ getTermSettings(fileno(cin), &initial_settings);
new_settings = initial_settings;
new_settings.c_lflag &= ~ICANON;
new_settings.c_lflag &= ~ECHO;
- ioctl(fileno(cin), TCSETAF, &new_settings);
+ setTermSettings(fileno(cin), &new_settings);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
/* vi: set sw=4 ts=4: */
/*
- * $Id: ping.c,v 1.12 2000/04/13 18:49:43 erik Exp $
+ * $Id: ping.c,v 1.13 2000/04/21 01:26:49 erik Exp $
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
if (i < 0)
perror("ping");
fprintf(stderr, "ping wrote %d chars; %d expected\n", i,
- sizeof(packet));
+ (int)sizeof(packet));
exit(1);
}
/* listen for replies */
while (1) {
struct sockaddr_in from;
- size_t fromlen = sizeof(from);
+ socklen_t fromlen = (socklen_t) sizeof(from);
int c;
if ((c = recvfrom(pingsock, packet, sizeof(packet), 0,
/* vi: set sw=4 ts=4: */
/*
- * $Id: ping.c,v 1.12 2000/04/13 18:49:43 erik Exp $
+ * $Id: ping.c,v 1.13 2000/04/21 01:26:49 erik Exp $
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
if (i < 0)
perror("ping");
fprintf(stderr, "ping wrote %d chars; %d expected\n", i,
- sizeof(packet));
+ (int)sizeof(packet));
exit(1);
}
/* listen for replies */
while (1) {
struct sockaddr_in from;
- size_t fromlen = sizeof(from);
+ socklen_t fromlen = (socklen_t) sizeof(from);
int c;
if ((c = recvfrom(pingsock, packet, sizeof(packet), 0,
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
-#include <sys/syscall.h>
+#define __LIBRARY__
+#include <asm/unistd.h>
+/* #include <sys/syscall.h> */
getcwd(cwd, sizeof(cwd));
#ifdef BB_FEATURE_SH_COMMAND_EDITING
+ cmdedit_init();
signal(SIGWINCH, win_changed);
win_changed(0);
#endif
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <termio.h>
+#include <sys/ioctl.h>
#include <ctype.h>
#include <signal.h>
static struct history *his_front = NULL; /* First element in command line list */
static struct history *his_end = NULL; /* Last element in command line list */
-static struct termio old_term, new_term; /* Current termio and the previous termio before starting ash */
+
+/* ED: sparc termios is broken: revert back to old termio handling. */
+#ifdef BB_FEATURE_USE_TERMIOS
+
+#if #cpu(sparc)
+# include <termio.h>
+# define termios termio
+# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#else
+# include <termios.h>
+# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+# define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#endif
+
+/* Current termio and the previous termio before starting sh */
+struct termios initial_settings, new_settings;
+#endif
+
+
static int cmdedit_termw = 80; /* actual terminal width */
static int cmdedit_scroll = 27; /* width of EOL scrolling region */
{
if (reset_term)
/* sparc and other have broken termios support: use old termio handling. */
- ioctl(fileno(stdin), TCSETA, (void *) &old_term);
+ setTermSettings(fileno(stdin), (void*) &initial_settings);
}
void clean_up_and_die(int sig)
{
cmdedit_reset_term();
fprintf(stdout, "\n");
- exit(TRUE);
+ if (sig!=SIGINT)
+ exit(TRUE);
}
/* Go to HOME position */
return (matches);
}
-void input_tab(char* command, int outputFd, int *cursor, int *len)
+void input_tab(char* command, char* prompt, int outputFd, int *cursor, int *len)
{
/* Do TAB completion */
static int num_matches=0;
memset(command, 0, sizeof(command));
if (!reset_term) {
- /* sparc and other have broken termios support: use old termio handling. */
- ioctl(inputFd, TCGETA, (void *) &old_term);
- memcpy(&new_term, &old_term, sizeof(struct termio));
-
- new_term.c_cc[VMIN] = 1;
- new_term.c_cc[VTIME] = 0;
- new_term.c_lflag &= ~ICANON; /* unbuffered input */
- new_term.c_lflag &= ~ECHO;
+
+ getTermSettings(inputFd, (void*) &initial_settings);
+ memcpy(&new_settings, &initial_settings, sizeof(struct termios));
+ new_settings.c_cc[VMIN] = 1;
+ new_settings.c_cc[VTIME] = 0;
+ new_settings.c_cc[VINTR] = _POSIX_VDISABLE; /* Turn off CTRL-C, so we can trap it */
+ new_settings.c_lflag &= ~ICANON; /* unbuffered input */
+ new_settings.c_lflag &= ~(ECHO|ECHOCTL|ECHONL); /* Turn off echoing */
reset_term = 1;
- ioctl(inputFd, TCSETA, (void *) &new_term);
- } else {
- ioctl(inputFd, TCSETA, (void *) &new_term);
}
+ setTermSettings(inputFd, (void*) &new_settings);
memset(command, 0, BUFSIZ);
if ((ret = read(inputFd, &c, 1)) < 1)
return;
+ //fprintf(stderr, "got a '%c' (%d)\n", c, c);
switch (c) {
case '\n':
case 2:
/* Control-b -- Move back one character */
input_backward(outputFd, &cursor);
+ break;
+ case 3:
+ /* Control-c -- leave the current line,
+ * and start over on the next line */
+
+ /* Go to the next line */
+ xwrite(outputFd, "\n", 1);
+
+ /* Rewrite the prompt */
+ xwrite(outputFd, prompt, strlen(prompt));
+
+ /* Reset the command string */
+ memset(command, 0, sizeof(command));
+ len = cursor = 0;
+
break;
case 4:
/* Control-d -- Delete one character, or exit
break;
case '\b':
case DEL:
- /* control-h and DEL */
+ /* Control-h and DEL */
input_backspace(command, outputFd, &cursor, &len);
break;
case '\t':
#ifdef BB_FEATURE_SH_TAB_COMPLETION
- input_tab(command, outputFd, &cursor, &len);
+ input_tab(command, prompt, outputFd, &cursor, &len);
#endif
break;
case 14:
}
nr = len + 1;
- /* sparc and other have broken termios support: use old termio handling. */
- ioctl(inputFd, TCSETA, (void *) &old_term);
+ setTermSettings(inputFd, (void *) &initial_settings);
reset_term = 0;
extern void cmdedit_init(void)
{
atexit(cmdedit_reset_term);
+ signal(SIGKILL, clean_up_and_die);
signal(SIGINT, clean_up_and_die);
signal(SIGQUIT, clean_up_and_die);
signal(SIGTERM, clean_up_and_die);
typedef size_t (*cmdedit_strwidth_proc)(char *);
+void cmdedit_init(void);
void cmdedit_read_input(char* promptStr, char* command); /* read a line of input */
void cmdedit_setwidth(int); /* specify width of screen */
void cmdedit_histadd(char *); /* adds entries to hist */
#else /* not __STDC__ */
+void cmdedit_init(void);
void cmdedit_read_input(char* promptStr, char* command);
void cmdedit_setwidth();
void cmdedit_histadd();
getcwd(cwd, sizeof(cwd));
#ifdef BB_FEATURE_SH_COMMAND_EDITING
+ cmdedit_init();
signal(SIGWINCH, win_changed);
win_changed(0);
#endif
static void doSyslogd (void)
{
struct sockaddr_un sunx;
- size_t addrLength;
+ socklen_t addrLength;
+
int sock_fd;
fd_set fds;
static void doSyslogd (void)
{
struct sockaddr_un sunx;
- size_t addrLength;
+ socklen_t addrLength;
+
int sock_fd;
fd_set fds;
len1=snprintf(buf, sizeof(buf), "%ld,%-ld ",
header.devmajor, header.devminor);
} else {
- len1=snprintf(buf, sizeof(buf), "%d ", header.size);
+ len1=snprintf(buf, sizeof(buf), "%lu ", (long)header.size);
}
/* Jump through some hoops to make the columns match up */
for(;(len+len1)<31;len++)
static const char more_usage[] = "more [file ...]\n";
+/* ED: sparc termios is broken: revert back to old termio handling. */
#ifdef BB_FEATURE_USE_TERMIOS
-#include <termio.h>
+#if #cpu(sparc)
+# include <termio.h>
+# define termios termio
+# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#else
+# include <termios.h>
+# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+# define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#endif
FILE *cin;
-/* sparc and other have broken termios support: use old termio handling. */
-struct termio initial_settings, new_settings;
+struct termios initial_settings, new_settings;
void gotsig(int sig)
{
- ioctl(fileno(cin), TCSETAF, &initial_settings);
+ setTermSettings(fileno(cin), &initial_settings);
fprintf(stdout, "\n");
exit(TRUE);
}
cin = fopen("/dev/tty", "r");
if (!cin)
cin = fopen("/dev/console", "r");
- ioctl(fileno(cin), TCGETA, &initial_settings);
+ getTermSettings(fileno(cin), &initial_settings);
new_settings = initial_settings;
new_settings.c_lflag &= ~ICANON;
new_settings.c_lflag &= ~ECHO;
- ioctl(fileno(cin), TCSETAF, &new_settings);
+ setTermSettings(fileno(cin), &new_settings);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
projects / oweals / busybox.git / commitdiff