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.
-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;
oot) - 1] != '/') Clearly this check is redundant, but rather than simply removing it we get a slight efficiency improvement by switching the normalization so that the virtual_root variable always ends in '/'. Do this with a new "ensure_end" helper. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-04-08ui-refs.c: Refactor print_tag()Lukas Fleischer The code snippets for OBJ_TAG and other object types are almost equivalent. Merge them and use a couple of inline if conditions to select proper fields. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-04-08ui-refs.c: Remove global header variableLukas Fleischer print_tag_header() is only called from cgit_print_tags() -- the conditional invocation in print_tag() is never executed since print_tag() is only called by cgit_print_tags() which already executes print_tag_header() before (resulting in the global variable being always set in when the condition is evaluated). Remove the global variable and the conditional invocation. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-04-08html.c: Replace strdup() with xstrdup()Lukas Fleischer Use the xstrdup() wrapper which already bails out if strdup() returns a NULL pointer. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-04-08Always #include corresponding .h in .c filesJohn Keeping While doing this, remove declarations from header files where the corresponding definition is declared "static" in order to avoid build errors. Also re-order existing headers in ui-*.c so that the file-specific header always comes immediately after "cgit.h", helping with future consistency. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-04-08cgit.mk: fix dependency handlingJohn Keeping Git calculates the dependency files to be included using a simply expanded Makefile variable, so it does not include the CGit objects that are added after that Makefile has been processed. We therefore need to include the dependency files ourselves in order to get the dependency calculations right. Do this. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-04-08Makefile: re-include cgit.conf in cgit.mkJohn Keeping This avoids needed to export every variable that might be used in cgit.mk from the top-level Makefile. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-04-08Do not unnecessarily strdup() environment variablesLukas Fleischer This reverts the memory duplication introduced in commit 60a2627, while keeping everything else that has been cleaned up. The environment variables are never modified, so we do not need to call xstrdupn() here. Also, remove xstrdupn() which is no longer needed. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-04-08Maŕk cgit_environment members constLukas Fleischer These reflect the values of environment variables and should never be changed. Add another xstrdup() when we assign environment variables to strings that are potentially non-constant. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-04-08Return const char * in cgit_{httpscheme, hosturl, rooturl}()Lukas Fleischer The return values of these functions are essentially constant and should never be modified. Note that this will introduce a compiler warning when we try to free the return value of any of these functions. However, given that all of these currently return statically allocated strings in some cases, they need to be refactored before this can be done anyway. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-04-08Update git to v1.8.2.1John Keeping This requires a small change to how we handle notes, but otherwise just works. Note that we can't use anything from v1.8.0 until v1.8.2.1 because some of the symbols that we need for graph drawing were made private in v1.8.0 and this was not reverted until v1.8.2.1. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-04-07ui-blob: don't segfault when no path is givenJohn Keeping It it possible to inspect blobs by specifying only the SHA-1, and CGit provides links to do so, for example if a tag points directly at a blob. In this case the path_items structure is never used, but creating it still causes strlen to be run on a null pointer. Fix this. This error was introduced by commit c1633c6 (Update git to v1.7.6.5 - 2013-03-02). Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20Convert pager navigation into a unordered listLukas Fleischer It is common practice and semantically appropriate to use unordered lists for long navigation lists. This also fixes the layout of very long pager navigations in Webkit-based browsers. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-03-20Makefile: remove CGIT-CFLAGS files in clean stageJason A. Donenfeld 2013-03-20ui-summary.c: Move urls variable into print_urls()Lukas Fleischer There's no need for this variable to be global. Printing the header in print_urls() instead of print_url() allows for moving this variable into print_urls() without having to pass any status to print_url(). Note that this only works as long as we don't call print_urls() more than once. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-03-20Fix colspan valuesLukas Fleischer This fixes a couple of minor oversights in previous commits and adjusts all cells using colspan to use the correct width. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-03-20html: check return value of writeJason A. Donenfeld This squelches a gcc warning. It's also correct that we check to see if there are any partial or failed writes. For now, we just print a warning to stderr. In the future, perhaps it will prove wise to exit(1) on partial writes. 2013-03-20ui-shared: squelch compiler warning.Jason A. Donenfeld Since tail is initialized to 0, we will never get a warning on the last if statement, but recent gcc complains anyway. So, we initialize len as well. Future gcc versions should be able to optimize this out anyway. 2013-03-20cgit.mk: Use SHELL_PATH_SQ to run gen-version.shJohn Keeping On some platforms (notably Solaris) /bin/sh doesn't support enough of POSIX for gen-version.sh to run. Git's Makefile provides SHELL_PATH_SQ to address this issue so we just have to use it. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20cgit.mk: don't rebuild everything if CGIT_VERSION changesJohn Keeping If CGIT_VERSION is in CGIT_CFLAGS then a change in version (for example because you have committed your changes) causes all of the CGit objects to be rebuilt. Avoid this by using EXTRA_CPPFLAGS to add the version for only those files that are affected and make them depend on VERSION. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20ui-patch: use cgit_version not CGIT_VERSIONJohn Keeping We already have a global cgit_version which is set from the #define'd CGIT_VERSION in cgit.c. Change ui-patch.c to use this so that we only need to rebuild cgit.o when the version changes. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20Makefile: re-use Git's Makefile where possibleJohn Keeping