projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch from I.Q. to add sort -u as a feature.
[oweals/busybox.git]
/
coreutils
/
uudecode.c
diff --git
a/coreutils/uudecode.c
b/coreutils/uudecode.c
index 7b26d2dad78b99545beb66495d7aaacf3e2d81a0..6a3f78a42404c6235d905dde59f44a52ca912b14 100644
(file)
--- a/
coreutils/uudecode.c
+++ b/
coreutils/uudecode.c
@@
-22,11
+22,15
@@
*/
*/
-#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
+#include <string.h>
+#include <stdlib.h>
+#include "busybox.h"
+#include "pwd_grp/pwd.h"
+#include "pwd_grp/grp.h"
/*struct passwd *getpwnam();*/
/*struct passwd *getpwnam();*/
@@
-42,7
+46,7
@@
static int read_stduu (const char *inname)
char *p;
if (fgets (buf, sizeof(buf), stdin) == NULL) {
char *p;
if (fgets (buf, sizeof(buf), stdin) == NULL) {
- error_msg("%s: Short file
\n
", inname);
+ error_msg("%s: Short file", inname);
return FALSE;
}
p = buf;
return FALSE;
}
p = buf;
@@
-77,7
+81,7
@@
static int read_stduu (const char *inname)
if (fgets (buf, sizeof(buf), stdin) == NULL
|| strcmp (buf, "end\n")) {
if (fgets (buf, sizeof(buf), stdin) == NULL
|| strcmp (buf, "end\n")) {
- error_msg("%s: No `end' line
\n
", inname);
+ error_msg("%s: No `end' line", inname);
return FALSE;
}
return FALSE;
}
@@
-127,7
+131,7
@@
static int read_base64 (const char *inname)
unsigned char *p;
if (fgets (buf, sizeof(buf), stdin) == NULL) {
unsigned char *p;
if (fgets (buf, sizeof(buf), stdin) == NULL) {
- error_msg("%s: Short file
\n
", inname);
+ error_msg("%s: Short file", inname);
return FALSE;
}
p = buf;
return FALSE;
}
p = buf;
@@
-135,7
+139,7
@@
static int read_base64 (const char *inname)
if (memcmp (buf, "====", 4) == 0)
break;
if (last_data != 0) {
if (memcmp (buf, "====", 4) == 0)
break;
if (last_data != 0) {
- error_msg("%s: data following `=' padding character
\n
", inname);
+ error_msg("%s: data following `=' padding character", inname);
return FALSE;
}
return FALSE;
}
@@
-157,14
+161,14
@@
static int read_base64 (const char *inname)
while ((b64_tab[*p] & '\100') != 0)
if (*p == '\n' || *p++ == '=') {
while ((b64_tab[*p] & '\100') != 0)
if (*p == '\n' || *p++ == '=') {
- error_msg("%s: illegal line
\n
", inname);
+ error_msg("%s: illegal line", inname);
return FALSE;
}
c2 = b64_tab[*p++];
while (b64_tab[*p] == '\177')
if (*p++ == '\n') {
return FALSE;
}
c2 = b64_tab[*p++];
while (b64_tab[*p] == '\177')
if (*p++ == '\n') {
- error_msg("%s: illegal line
\n
", inname);
+ error_msg("%s: illegal line", inname);
return FALSE;
}
if (*p == '=') {
return FALSE;
}
if (*p == '=') {
@@
-176,7
+180,7
@@
static int read_base64 (const char *inname)
while (b64_tab[*p] == '\177')
if (*p++ == '\n') {
while (b64_tab[*p] == '\177')
if (*p++ == '\n') {
- error_msg("%s: illegal line
\n
", inname);
+ error_msg("%s: illegal line", inname);
return FALSE;
}
putchar (c1 << 2 | c2 >> 4);
return FALSE;
}
putchar (c1 << 2 | c2 >> 4);
@@
-208,7
+212,7
@@
static int decode (const char *inname,
while (1) {
if (fgets (buf, sizeof (buf), stdin) == NULL) {
while (1) {
if (fgets (buf, sizeof (buf), stdin) == NULL) {
- error_msg("%s: No `begin' line
\n
", inname);
+ error_msg("%s: No `begin' line", inname);
return FALSE;
}
return FALSE;
}
@@
-233,13
+237,13
@@
static int decode (const char *inname,
while (*p != '/')
++p;
if (*p == '\0') {
while (*p != '/')
++p;
if (*p == '\0') {
- error_msg("%s: Illegal ~user
\n
", inname);
+ error_msg("%s: Illegal ~user", inname);
return FALSE;
}
*p++ = '\0';
pw = getpwnam (buf + 1);
if (pw == NULL) {
return FALSE;
}
*p++ = '\0';
pw = getpwnam (buf + 1);
if (pw == NULL) {
- error_msg("%s: No user `%s'
\n
", inname, buf + 1);
+ error_msg("%s: No user `%s'", inname, buf + 1);
return FALSE;
}
n = strlen (pw->pw_dir);
return FALSE;
}
n = strlen (pw->pw_dir);
@@
-288,7
+292,7
@@
int uudecode_main (int argc,
break;
default:
break;
default:
-
usage(uudecode_usage
);
+
show_usage(
);
}
}
}
}