Compare commits
3 Commits
fd1ed79329
...
ab003f7d4a
Author | SHA1 | Date | |
---|---|---|---|
ab003f7d4a | |||
3c243e4a09 | |||
49031102f2 |
@ -30,11 +30,8 @@ int usage(char *s) {
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
int c;
|
||||
char showend;
|
||||
char showtab;
|
||||
|
||||
showend = 0;
|
||||
showtab = 0;
|
||||
char showend = 0; /* print a dollar sign before each newline */
|
||||
char showtab = 0; /* prints tab characters in caret notation */
|
||||
|
||||
if (argc > 0) {
|
||||
while ((c = getopt(argc, argv, "et")) != -1) {
|
||||
@ -52,7 +49,7 @@ int main(int argc, char *argv[]) {
|
||||
if ((c & 0x80) != 0) { fputs("M-", stdout); }
|
||||
|
||||
switch (c ^ 0x80) { /* 0b 1000 0000 */
|
||||
case 0x7f: fputs("^?", stdout); break;
|
||||
case 0x7f: fputs("^?", stdout); break; /* delete character */
|
||||
case '\n': if (showend) { putc('$', stdout); }
|
||||
default:
|
||||
if (c >= ' ' || c == '\n' || (!showtab && c == '\t')) {
|
||||
|
32
src/str.c
32
src/str.c
@ -29,7 +29,7 @@ static char *program_name = "str";
|
||||
static struct {
|
||||
char *name;
|
||||
int (*f)(int);
|
||||
}ctypes[] = {
|
||||
} ctypes[] = {
|
||||
{ "isalnum", isalnum },
|
||||
{ "isalpha", isalpha },
|
||||
{ "isblank", isblank },
|
||||
@ -49,27 +49,33 @@ int main(int argc, char *argv[]){
|
||||
int i;
|
||||
int r;
|
||||
|
||||
if(argc >= 3){
|
||||
for(ctype = 0; ctype < (sizeof ctypes) / (sizeof *ctypes);
|
||||
++ctype)
|
||||
if(strcmp(argv[1], ctypes[ctype].name) == 0)
|
||||
if (argc >= 3) {
|
||||
for (ctype = 0; ctype < (sizeof ctypes) / (sizeof *ctypes); ++ctype) {
|
||||
if(strcmp(argv[1], ctypes[ctype].name) == 0) {
|
||||
goto pass;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fprintf(stderr, "Usage: %s type string...\n",
|
||||
argv[0] == NULL ? program_name : argv[0]);
|
||||
fprintf(
|
||||
stderr,
|
||||
"Usage: %s type string...\n",
|
||||
argv[0] == NULL ? program_name : argv[0]
|
||||
);
|
||||
|
||||
return EX_USAGE;
|
||||
|
||||
pass: for(argv += 2, r = 1; *argv != NULL; ++argv)
|
||||
for(i = 0; argv[0][i] != '\0'; ++i)
|
||||
pass: for (argv += 2, r = 1; *argv != NULL; ++argv) {
|
||||
for (i = 0; argv[0][i] != '\0'; ++i) {
|
||||
/* First checks if argv[0][i] is valid ASCII; ctypes(3)
|
||||
* don't handle non-ASCII.
|
||||
* This is bad. */
|
||||
if((unsigned char)argv[0][i] < 0x80 && !ctypes[ctype].f(argv[0][i]))
|
||||
return 1;
|
||||
else
|
||||
r = 0;
|
||||
if(
|
||||
(unsigned char)argv[0][i] < 0x80 && !ctypes[ctype].f(argv[0][i])
|
||||
) { return 1; }
|
||||
else { r = 0; }
|
||||
}
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
@ -37,8 +37,10 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
for (; *argv[1] != '\0'; ++argv[1]) {
|
||||
for (i = 2; i < argc; ++i) {
|
||||
if (*argv[i-1] > *argv[i]) {
|
||||
/* a former string has a greater byte value */
|
||||
if (*argv[i-1] > *argv[i]) {
|
||||
return 1;
|
||||
/* a latter string has a greater byte value */
|
||||
} else if (*argv[i-1] < *argv[i]++) {
|
||||
return -1; /* actually 255 */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user