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

-Wshadow tr fix from Jeff Garzik

Browse Source
This commit is contained in:
Eric Andersen 2001-03-23 17:08:21 +00:00
parent 82ab8da245
commit f6aa13d403
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
coreutils/tr.c
View File

@ -142,7 +142,7 @@ extern int tr_main(int argc, char **argv)
{ {
register unsigned char *ptr; register unsigned char *ptr;
int output_length=0, input_length; int output_length=0, input_length;
int index = 1; int idx = 1;
int i; int i;
RESERVE_BB_BUFFER(output, BUFSIZ); RESERVE_BB_BUFFER(output, BUFSIZ);
RESERVE_BB_BUFFER(input, BUFSIZ); RESERVE_BB_BUFFER(input, BUFSIZ);
@ -157,8 +157,8 @@ extern int tr_main(int argc, char **argv)
pinvec = invec; pinvec = invec;
poutvec = outvec; poutvec = outvec;
if (argc > 1 && argv[index][0] == '-') { if (argc > 1 && argv[idx][0] == '-') {
for (ptr = (unsigned char *) &argv[index][1]; *ptr; ptr++) { for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) {
switch (*ptr) { switch (*ptr) {
case 'c': case 'c':
com_fl = TRUE; com_fl = TRUE;
@ -173,21 +173,21 @@ extern int tr_main(int argc, char **argv)
show_usage(); show_usage();
} }
} }
index++; idx++;
} }
for (i = 0; i <= ASCII; i++) { for (i = 0; i <= ASCII; i++) {
vector[i] = i; vector[i] = i;
invec[i] = outvec[i] = FALSE; invec[i] = outvec[i] = FALSE;
} }
if (argv[index] != NULL) { if (argv[idx] != NULL) {
input_length = expand(argv[index++], input); input_length = expand(argv[idx++], input);
if (com_fl) if (com_fl)
input_length = complement(input, input_length); input_length = complement(input, input_length);
if (argv[index] != NULL) { if (argv[idx] != NULL) {
if (*argv[index] == '\0') if (*argv[idx] == '\0')
error_msg_and_die("STRING2 cannot be empty"); error_msg_and_die("STRING2 cannot be empty");
output_length = expand(argv[index], output); output_length = expand(argv[idx], output);
map(input, input_length, output, output_length); map(input, input_length, output, output_length);
} }
for (i = 0; i < input_length; i++) for (i = 0; i < input_length; i++)

10
sysklogd/syslogd.c
View File

@ -55,7 +55,7 @@
#define __LOG_FILE "/var/log/messages" #define __LOG_FILE "/var/log/messages"
/* Path to the unix socket */ /* Path to the unix socket */
char lfile[BUFSIZ] = ""; static char lfile[BUFSIZ] = "";
static char *logFilePath = __LOG_FILE; static char *logFilePath = __LOG_FILE;
@ -390,18 +390,18 @@ static void domark(int sig)
static const int BUFSIZE = 1023; static const int BUFSIZE = 1023;
static int serveConnection (int conn) static int serveConnection (int conn)
{ {
RESERVE_BB_BUFFER(buf, BUFSIZE + 1); RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
int n_read; int n_read;
while ((n_read = read (conn, buf, BUFSIZE )) > 0) { while ((n_read = read (conn, tmpbuf, BUFSIZE )) > 0) {
int pri = (LOG_USER | LOG_NOTICE); int pri = (LOG_USER | LOG_NOTICE);
char line[ BUFSIZE + 1 ]; char line[ BUFSIZE + 1 ];
unsigned char c; unsigned char c;
char *p = buf, *q = line; char *p = tmpbuf, *q = line;
buf[ n_read - 1 ] = '\0'; tmpbuf[ n_read - 1 ] = '\0';
while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) {
if (c == '<') { if (c == '<') {

10
syslogd.c
View File

@ -55,7 +55,7 @@
#define __LOG_FILE "/var/log/messages" #define __LOG_FILE "/var/log/messages"
/* Path to the unix socket */ /* Path to the unix socket */
char lfile[BUFSIZ] = ""; static char lfile[BUFSIZ] = "";
static char *logFilePath = __LOG_FILE; static char *logFilePath = __LOG_FILE;
@ -390,18 +390,18 @@ static void domark(int sig)
static const int BUFSIZE = 1023; static const int BUFSIZE = 1023;
static int serveConnection (int conn) static int serveConnection (int conn)
{ {
RESERVE_BB_BUFFER(buf, BUFSIZE + 1); RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
int n_read; int n_read;
while ((n_read = read (conn, buf, BUFSIZE )) > 0) { while ((n_read = read (conn, tmpbuf, BUFSIZE )) > 0) {
int pri = (LOG_USER | LOG_NOTICE); int pri = (LOG_USER | LOG_NOTICE);
char line[ BUFSIZE + 1 ]; char line[ BUFSIZE + 1 ];
unsigned char c; unsigned char c;
char *p = buf, *q = line; char *p = tmpbuf, *q = line;
buf[ n_read - 1 ] = '\0'; tmpbuf[ n_read - 1 ] = '\0';
while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) {
if (c == '<') { if (c == '<') {

18
tr.c
View File

@ -142,7 +142,7 @@ extern int tr_main(int argc, char **argv)
{ {
register unsigned char *ptr; register unsigned char *ptr;
int output_length=0, input_length; int output_length=0, input_length;
int index = 1; int idx = 1;
int i; int i;
RESERVE_BB_BUFFER(output, BUFSIZ); RESERVE_BB_BUFFER(output, BUFSIZ);
RESERVE_BB_BUFFER(input, BUFSIZ); RESERVE_BB_BUFFER(input, BUFSIZ);
@ -157,8 +157,8 @@ extern int tr_main(int argc, char **argv)
pinvec = invec; pinvec = invec;
poutvec = outvec; poutvec = outvec;
if (argc > 1 && argv[index][0] == '-') { if (argc > 1 && argv[idx][0] == '-') {
for (ptr = (unsigned char *) &argv[index][1]; *ptr; ptr++) { for (ptr = (unsigned char *) &argv[idx][1]; *ptr; ptr++) {
switch (*ptr) { switch (*ptr) {
case 'c': case 'c':
com_fl = TRUE; com_fl = TRUE;
@ -173,21 +173,21 @@ extern int tr_main(int argc, char **argv)
show_usage(); show_usage();
} }
} }
index++; idx++;
} }
for (i = 0; i <= ASCII; i++) { for (i = 0; i <= ASCII; i++) {
vector[i] = i; vector[i] = i;
invec[i] = outvec[i] = FALSE; invec[i] = outvec[i] = FALSE;
} }
if (argv[index] != NULL) { if (argv[idx] != NULL) {
input_length = expand(argv[index++], input); input_length = expand(argv[idx++], input);
if (com_fl) if (com_fl)
input_length = complement(input, input_length); input_length = complement(input, input_length);
if (argv[index] != NULL) { if (argv[idx] != NULL) {
if (*argv[index] == '\0') if (*argv[idx] == '\0')
error_msg_and_die("STRING2 cannot be empty"); error_msg_and_die("STRING2 cannot be empty");
output_length = expand(argv[index], output); output_length = expand(argv[idx], output);
map(input, input_length, output, output_length); map(input, input_length, output, output_length);
} }
for (i = 0; i < input_length; i++) for (i = 0; i < input_length; i++)