Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More unambiguous and simple command line semantics (bb [options/cmds]

Browse Source 
[[--] path])
This commit is contained in:
Bruce Hill 2019-11-11 12:48:48 -08:00
parent dbd558f6e2
commit 18a63e4bc0
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bb.1
View File

@ -11,7 +11,7 @@ bb \- A bitty browser for command line file management
[\fI-v\fR|\fI--version\fR] [\fI-v\fR|\fI--version\fR]
[\fI-h\fR|\fI--help\fR] [\fI-h\fR|\fI--help\fR]
[\fI+command\fR]* [\fI+command\fR]*
[\fIdirectory\fR] [[--] \fIdirectory\fR]
.SH DESCRIPTION .SH DESCRIPTION
\fBbb\fR is a tiny TUI console application for browsing and managing files. \fBbb\fR is a tiny TUI console application for browsing and managing files.
.SH OPTIONS .SH OPTIONS

33
bb.c
View File

@ -1154,23 +1154,25 @@ int wait_for_process(proc_t **proc)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *initial_path = NULL, depthstr[16] = {0}; char *initial_path;
if (argc >= 3 && strcmp(argv[argc-2], "--") == 0) {
initial_path = argv[argc-1];
argc -= 2;
} else if (argc >= 2 && argv[argc-1][0] != '-' && argv[argc-1][0] != '+') {
initial_path = argv[argc-1];
argc -= 1;
} else {
initial_path = ".";
}
char sep = '\n'; char sep = '\n';
int print_dir = 0, print_selection = 0; int print_dir = 0, print_selection = 0;
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
// Commands are processed below, after flags have been parsed // Commands are processed below, after flags have been parsed
if (argv[i][0] == '+') { if (argv[i][0] == '+') {
char *colon = strchr(argv[i], ':'); char *colon = strchr(argv[i], ':');
if (colon && !colon[1]) if (colon && !colon[1])
break; break;
} else if (strcmp(argv[i], "--") == 0) {
if (i + 1 < argc) initial_path = argv[i+1];
if (i + 2 < argc) {
printf("Extra arguments after %s\n%s", argv[i+1], usage_str);
return 1;
}
break;
} else if (strcmp(argv[i], "--help") == 0) { } else if (strcmp(argv[i], "--help") == 0) {
help: help:
printf("%s%s", description_str, usage_str); printf("%s%s", description_str, usage_str);
@ -1179,11 +1181,7 @@ int main(int argc, char *argv[])
version: version:
printf("bb " BB_VERSION "\n"); printf("bb " BB_VERSION "\n");
return 0; return 0;
} else if (argv[i][0] == '-' && argv[i][1] == '-') { } else if (argv[i][0] == '-' && argv[i][1] != '-') {
if (argv[i][2] == '\0') break;
printf("Unknown command line argument: %s\n%s", argv[i], usage_str);
return 1;
} else if (argv[i][0] == '-') {
for (char *c = &argv[i][1]; *c; c++) { for (char *c = &argv[i][1]; *c; c++) {
switch (*c) { switch (*c) {
case 'h': goto help; case 'h': goto help;
@ -1195,14 +1193,11 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
} }
} else if (!initial_path) {
initial_path = argv[i];
} else { } else {
printf("Unknown command line argument: %s\n%s", argv[i], usage_str); printf("Unknown command line argument: \"%s\"\n%s", argv[i], usage_str);
return 1; return 1;
} }
} }
if (!initial_path) initial_path = ".";
cmdfilename = memcheck(strdup(CMDFILE_FORMAT)); cmdfilename = memcheck(strdup(CMDFILE_FORMAT));
int cmdfd; int cmdfd;
@ -1221,6 +1216,7 @@ int main(int argc, char *argv[])
setenv("EDITOR", "nano", 0); setenv("EDITOR", "nano", 0);
char *curdepth = getenv("BB_DEPTH"); char *curdepth = getenv("BB_DEPTH");
int depth = curdepth ? atoi(curdepth) : 0; int depth = curdepth ? atoi(curdepth) : 0;
char depthstr[16];
sprintf(depthstr, "%d", depth + 1); sprintf(depthstr, "%d", depth + 1);
setenv("BB_DEPTH", depthstr, 1); setenv("BB_DEPTH", depthstr, 1);
setenv("BBCMD", cmdfilename, 1); setenv("BBCMD", cmdfilename, 1);
@ -1258,7 +1254,6 @@ int main(int argc, char *argv[])
write(cmdfd, "\0", 1); write(cmdfd, "\0", 1);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
if (strcmp(argv[i], "--") == 0) break;
if (argv[i][0] == '+') { if (argv[i][0] == '+') {
char *cmd = argv[i] + 1; char *cmd = argv[i] + 1;
char *colon = strchr(cmd, ':'); char *colon = strchr(cmd, ':');

2
bb.h
View File

@ -251,7 +251,7 @@ static const struct termios default_termios = {
}; };
static const char *description_str = "bb - an itty bitty console TUI file browser\n"; static const char *description_str = "bb - an itty bitty console TUI file browser\n";
static const char *usage_str = "Usage: bb (-h/--help | -v/--version | -s | -d | -0 | +command | path)*\n"; static const char *usage_str = "Usage: bb (-h/--help | -v/--version | -s | -d | -0 | +command)* [[--] directory]\n";
// Shell functions // Shell functions
static const char *bbcmdfn = "bbcmd() {\n" static const char *bbcmdfn = "bbcmd() {\n"