fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code-style: unindent one level of switch

Browse Source
This commit is contained in:
Hiltjo Posthuma 2015-02-20 13:27:57 +01:00
parent 5a6715c0cf
commit 6c7ff5fda5
3 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
find.c
View File

@ -284,14 +284,14 @@ static int
pri_type(Arg *arg) pri_type(Arg *arg)
{ {
switch ((char)arg->extra.i) { switch ((char)arg->extra.i) {
default : return 0; /* impossible, but placate warnings */ default : return 0; /* impossible, but placate warnings */
case 'b': return S_ISBLK (arg->st->st_mode); case 'b': return S_ISBLK (arg->st->st_mode);
case 'c': return S_ISCHR (arg->st->st_mode); case 'c': return S_ISCHR (arg->st->st_mode);
case 'd': return S_ISDIR (arg->st->st_mode); case 'd': return S_ISDIR (arg->st->st_mode);
case 'l': return S_ISLNK (arg->st->st_mode); case 'l': return S_ISLNK (arg->st->st_mode);
case 'p': return S_ISFIFO(arg->st->st_mode); case 'p': return S_ISFIFO(arg->st->st_mode);
case 'f': return S_ISREG (arg->st->st_mode); case 'f': return S_ISREG (arg->st->st_mode);
case 's': return S_ISSOCK(arg->st->st_mode); case 's': return S_ISSOCK(arg->st->st_mode);
} }
} }

88
readlink.c
View File

@ -45,52 +45,52 @@ main(int argc, char *argv[])
#define SWAP_BUF() (b = (b == buf1 ? buf2 : buf1)); #define SWAP_BUF() (b = (b == buf1 ? buf2 : buf1));
switch (mefflag) { switch (mefflag) {
case 'm': case 'm':
if (argv[0][0] == '/') { /* case when path is on '/' */ if (argv[0][0] == '/') { /* case when path is on '/' */
arg[0] = '/'; arg[0] = '/';
arg[1] = '\0'; arg[1] = '\0';
p++; p++;
} else if (!strchr(argv[0], '/')) { /* relative path */ } else if (!strchr(argv[0], '/')) { /* relative path */
arg[0] = '.'; arg[0] = '.';
arg[1] = '/'; arg[1] = '/';
arg[2] = '\0'; arg[2] = '\0';
} else } else
arg[0] = '\0'; arg[0] = '\0';
if (strlcat(arg, argv[0], PATH_MAX) >= PATH_MAX) if (strlcat(arg, argv[0], PATH_MAX) >= PATH_MAX)
eprintf("path too long\n"); eprintf("path too long\n");
while ((p = strchr(p, '/'))) { while ((p = strchr(p, '/'))) {
*p = '\0'; *p = '\0';
if (!realpath(arg, b)) {
*p = '/';
goto mdone;
}
SWAP_BUF();
lp = p;
*p++ = '/';
}
if (!realpath(arg, b)) { if (!realpath(arg, b)) {
mdone: *p = '/';
SWAP_BUF(); goto mdone;
if (lp) {
/* drop the extra '/' on root */
lp += (argv[0][0] == '/' &&
lp - arg == 1);
if (strlcat(b, lp, PATH_MAX) >= PATH_MAX)
eprintf("path too long\n");
}
} }
break; SWAP_BUF();
case 'e': lp = p;
if (stat(argv[0], &st) < 0) *p++ = '/';
eprintf("stat %s:", argv[0]); }
case 'f': if (!realpath(arg, b)) {
if (!realpath(argv[0], b)) mdone:
eprintf("realpath %s:", argv[0]); SWAP_BUF();
break; if (lp) {
default: /* drop the extra '/' on root */
if ((n = readlink(argv[0], b, PATH_MAX - 1)) < 0) lp += (argv[0][0] == '/' &&
eprintf("readlink %s:", argv[0]); lp - arg == 1);
b[n] = '\0'; if (strlcat(b, lp, PATH_MAX) >= PATH_MAX)
eprintf("path too long\n");
}
}
break;
case 'e':
if (stat(argv[0], &st) < 0)
eprintf("stat %s:", argv[0]);
case 'f':
if (!realpath(argv[0], b))
eprintf("realpath %s:", argv[0]);
break;
default:
if ((n = readlink(argv[0], b, PATH_MAX - 1)) < 0)
eprintf("readlink %s:", argv[0]);
b[n] = '\0';
} }
printf("%s", b); printf("%s", b);
if (!nflag) if (!nflag)

48
uudecode.c
View File

@ -101,30 +101,30 @@ uudecodeb64(FILE *fp, FILE *outfp)
continue; continue;
} else if (*pb == '=') { } else if (*pb == '=') {
switch (b) { switch (b) {
case 0: case 0:
/* expected '=' remaining /* expected '=' remaining
* including footer */ * including footer */
if (--t) { if (--t) {
fwrite(out, 1, fwrite(out, 1,
(po - out), (po - out),
outfp); outfp);
return; return;
} }
continue; continue;
case 1: case 1:
eprintf("%d: unexpected \"=\"" eprintf("%d: unexpected \"=\""
"appeared\n", l); "appeared\n", l);
case 3: case 2:
*po++ = b24[0]; *po++ = b24[0];
*po++ = b24[1]; b = 0;
b = 0; t = 5; /* expect 5 '=' */
t = 6; /* expect 6 '=' */ continue;
continue; case 3:
case 2: *po++ = b24[0];
*po++ = b24[0]; *po++ = b24[1];
b = 0; b = 0;
t = 5; /* expect 5 '=' */ t = 6; /* expect 6 '=' */
continue; continue;
} }
} else if ((e = b64dt[(int)*pb]) == -1) } else if ((e = b64dt[(int)*pb]) == -1)
eprintf("%d: invalid byte \"%c\"\n", l, *pb); eprintf("%d: invalid byte \"%c\"\n", l, *pb);