Re-indent crunched_main.c in preparation for D25998

This commit is contained in:
Alex Richardson
2020-08-24 09:20:18 +00:00
parent 0f31fdf253
commit b0f558df9f
+41 -42
View File
@@ -40,8 +40,8 @@ __FBSDID("$FreeBSD$");
#include <string.h> #include <string.h>
struct stub { struct stub {
char *name; char *name;
int (*f)(); int (*f)();
}; };
extern char *__progname; extern char *__progname;
@@ -52,65 +52,64 @@ static void crunched_usage(void);
int int
main(int argc, char **argv, char **envp) main(int argc, char **argv, char **envp)
{ {
char *slash, *basename; char *slash, *basename;
struct stub *ep; struct stub *ep;
if(argv[0] == NULL || *argv[0] == '\0') if (argv[0] == NULL || *argv[0] == '\0')
crunched_usage(); crunched_usage();
slash = strrchr(argv[0], '/'); slash = strrchr(argv[0], '/');
basename = slash? slash+1 : argv[0]; basename = slash ? slash + 1 : argv[0];
for(ep=entry_points; ep->name != NULL; ep++) for (ep = entry_points; ep->name != NULL; ep++)
if(!strcmp(basename, ep->name)) break; if (!strcmp(basename, ep->name))
break;
if(ep->name) if (ep->name)
return ep->f(argc, argv, envp); return ep->f(argc, argv, envp);
else { else {
fprintf(stderr, "%s: %s not compiled in\n", EXECNAME, basename); fprintf(stderr, "%s: %s not compiled in\n", EXECNAME, basename);
crunched_usage(); crunched_usage();
} }
} }
int int
crunched_main(int argc, char **argv, char **envp) crunched_main(int argc, char **argv, char **envp)
{ {
char *slash; char *slash;
struct stub *ep; struct stub *ep;
int columns, len; int columns, len;
if(argc <= 1) if (argc <= 1)
crunched_usage(); crunched_usage();
slash = strrchr(argv[1], '/'); slash = strrchr(argv[1], '/');
__progname = slash? slash+1 : argv[1]; __progname = slash ? slash + 1 : argv[1];
return main(--argc, ++argv, envp); return main(--argc, ++argv, envp);
} }
static void static void
crunched_usage() crunched_usage()
{ {
int columns, len; int columns, len;
struct stub *ep; struct stub *ep;
fprintf(stderr, "usage: %s <prog> <args> ..., where <prog> is one of:\n", fprintf(stderr,
EXECNAME); "usage: %s <prog> <args> ..., where <prog> is one of:\n", EXECNAME);
columns = 0; columns = 0;
for(ep=entry_points; ep->name != NULL; ep++) { for (ep = entry_points; ep->name != NULL; ep++) {
len = strlen(ep->name) + 1; len = strlen(ep->name) + 1;
if(columns+len < 80) if (columns + len < 80)
columns += len; columns += len;
else { else {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
columns = len; columns = len;
}
fprintf(stderr, " %s", ep->name);
} }
fprintf(stderr, " %s", ep->name); fprintf(stderr, "\n");
} exit(1);
fprintf(stderr, "\n");
exit(1);
} }
/* end of crunched_main.c */ /* end of crunched_main.c */