summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-01-04 01:40:33 -0500
committerJune McEnroe <june@causal.agency>2020-01-04 01:40:33 -0500
commit6ff2b4e2b5b8f91f7fcd4c28314f23dd8918eca6 (patch)
tree9f5d75ac3abf7edfbc6911179ec9e41d9bd83bdd
parentExpand scoop(1) documentation (diff)
downloadlitterbox-6ff2b4e2b5b8f91f7fcd4c28314f23dd8918eca6.tar.gz
litterbox-6ff2b4e2b5b8f91f7fcd4c28314f23dd8918eca6.zip
Rename unscoop -C to -c
For consistency with scoop.
Diffstat (limited to '')
-rw-r--r--unscoop.114
-rw-r--r--unscoop.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/unscoop.1 b/unscoop.1
index 6418733..b43fcef 100644
--- a/unscoop.1
+++ b/unscoop.1
@@ -1,4 +1,4 @@
-.Dd December 23, 2019
+.Dd January 4, 2020
 .Dt UNSCOOP 1
 .Os
 .
@@ -9,15 +9,15 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
-.Op Fl C Ar context
 .Op Fl N Ar network
+.Op Fl c Ar context
 .Op Fl d Ar path
 .Op Fl f Ar format
 .Ar
 .
 .Nm
-.Fl D
 .Op Fl d Ar path
+.Fl D
 .
 .Sh DESCRIPTION
 The
@@ -34,10 +34,6 @@ should be run from the log directory root.
 .Pp
 The arguments are as follows:
 .Bl -tag -width Ds
-.It Fl C Ar context
-Override the context (channel or query) name
-of imported logs.
-.
 .It Fl D
 Delete duplicate events from overlapping imports.
 This operation requires SQLite version 3.25.0 or newer.
@@ -45,6 +41,10 @@ This operation requires SQLite version 3.25.0 or newer.
 .It Fl N Ar network
 Override the network name of the imported logs.
 .
+.It Fl c Ar context
+Override the context (channel or query) name
+of imported logs.
+.
 .It Fl d Ar path
 Set the database path.
 The database must have been initialized by
diff --git a/unscoop.c b/unscoop.c
index 085c134..7c04ca1 100644
--- a/unscoop.c
+++ b/unscoop.c
@@ -305,11 +305,11 @@ int main(int argc, char *argv[]) {
 	const struct Format *format = &Formats[0];
 
 	int opt;
-	while (0 < (opt = getopt(argc, argv, "C:DN:d:f:v"))) {
+	while (0 < (opt = getopt(argc, argv, "DN:c:d:f:v"))) {
 		switch (opt) {
-			break; case 'C': context = optarg;
 			break; case 'D': dedup = true;
 			break; case 'N': network = optarg;
+			break; case 'c': context = optarg;
 			break; case 'd': path = optarg;
 			break; case 'f': format = formatParse(optarg);
 			break; case 'v': verbose = true;