about summary refs log tree commit diff
path: root/catgirl.1
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-05-27 14:10:34 -0400
committerJune McEnroe <june@causal.agency>2021-05-27 14:10:34 -0400
commit27a93090bb707cdbb4fcba7aff1e1813ca0b37d9 (patch)
tree39b9204311195feb2eaad1dc53170695a121caf9 /catgirl.1
parentSet username from SSH_CLIENT in chroot (diff)
downloadcatgirl-27a93090bb707cdbb4fcba7aff1e1813ca0b37d9.tar.gz
catgirl-27a93090bb707cdbb4fcba7aff1e1813ca0b37d9.zip
Document channel key parameters
Diffstat (limited to 'catgirl.1')
-rw-r--r--catgirl.110
1 files changed, 6 insertions, 4 deletions
diff --git a/catgirl.1 b/catgirl.1
index fd9e696..2bf26f3 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -269,9 +269,11 @@ The commands which can be filtered are:
 .Sy QUIT ,
 .Sy SETNAME .
 .
-.It Fl j Ar join , Cm join = Ar join
-Join the comma-separated list of channels
-.Ar join .
+.It Fl j Ar channels Oo Ar keys Oc , Cm join = Ar channels Oo Ar keys Oc
+Join the comma-separated list of
+.Ar channels
+with the optional comma-separated list of channel
+.Ar keys .
 .
 .It Fl k Ar path , Cm priv = Ar priv
 Load the TLS client private key from
@@ -412,7 +414,7 @@ Set or clear your away status.
 Send a command to ChanServ.
 .It Ic /invite Ar nick
 Invite a user to the channel.
-.It Ic /join Ar channel
+.It Ic /join Ar channel Op Ar key
 Join a channel.
 .It Ic /list Op Ar channel
 List channels.
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