Diff [46260161946c87dfed4fef9e3223b2327895f139:44852852e414ed350fdab8722fe38b06e4e68daf] for / – BarnOwl

COPYING

-                      rccc182c
+                      r7869e48
 the original authors' reputations.
   Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that companies distributing free
 …
 General Public License rather than by this special one.
                   GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 …
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
 . You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 …
 and you may at your option offer warranty protection in exchange for a
 fee.
 . You may modify your copy or copies of the Library or any portion
 …
 these notices.
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 …
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
 . As an exception to the Sections above, you may also compile or
 …
 distribute.
 . You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 …
 You are not responsible for enforcing compliance by third parties to
 this License.
 . If, as a consequence of a court judgment or allegation of patent
 …
 the Free Software Foundation.
 . If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 …
                      END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Libraries
 …
   - "Package" refers to the collection of files distributed by the Copyright
     Holder, and derivatives of that collection of files created through
     textual modification.
+    textual modification.
   - "Standard Version" refers to such a Package if it has not been modified,
     or has been modified in accordance with the wishes of the Copyright
     Holder.
+    Holder.
   - "Copyright Holder" is whoever is named in the copyright or copyrights for
     the package.
+    the package.
   - "You" is you, if you're thinking about copying or distributing this Package.
   - "Reasonable copying fee" is whatever you can justify on the basis of media
     cost, duplication charges, time of people involved, and so on. (You will
     not be required to justify it to the Copyright Holder, but only to the
     computing community at large as a market that must bear the fee.)
+    computing community at large as a market that must bear the fee.)
   - "Freely Available" means that no fee is charged for the item itself, though
     there may be fees involved in handling the item. It also means that
     recipients of the item may redistribute it under the same conditions they
     received it.
+    received it.
 . You may make and give away verbatim copies of the source form of the

ChangeLog

-                      r65ff3f4
+                      r7869e48
      libncursesw. - asedeno
    * text entry:
     first pass at utf-8 text entry.
+    first pass at utf-8 text entry.
    * Change wcwidth() calls to mk_wcwidth() - asedeno
    * First pass at outbound zephyr -> iso-8859-1 sanitizing.
 …
 .1.12pre
         Don't crash when sending/logging outgoing
+        Don't crash when sending/logging outgoing
            AIM message and not logged in [BZ 90]
         Don't crash when senging to someone not on AIM buddy list [BZ 94]
            (patch from Alex Vandiver)
 .1.11
         Don't crash doing zlocate with bad tickets. [BZ 12]
 …
         A fix for certain resize crashes (partly from alexmv) [BZ 55]
         Turn off ISTRIP (gildea)
 .1.9
         Include /usr/include/kerberosIV if it's found
 .1.8
         Do OLC formatting for anything coming from olc.matisse
         Improvements to popup size algorithm (from gildea)
         Improved 'show colors' with non-colored labels
 .1.7
         The colorclass command is added, to make colorization easy
 …
         Do ntohs() when printing zephyr port in zephyr info
         Updated man page
 .1.6
         Fixed three bugs found by Valgrind.
 …
         Dropped first brace in muxevents functions for consistency
         Catch SIGHUP and SIGTERM and do a proper logout
 .1.5
         Added a licence
 …
           will also be logged if this is set to 'on'
         Added 'show license'
 .1.4
         Normalize and downcase AIM names for logging
 …
         Do the initial zephyr_buddy_check when pseduologin set to true.
         Updated man page
 .1.2
         removed unused filter_depth variable
         Fixed memory bug on receiving pings
 .1.1
         Filters of filters now work.
 …
         Don't print extra new lines in popless_file
         New zephyr_get_field function
 .0.14
         Fixed missing word in startup message
 …
         Current directory added to 'status' command
         Massive changes to libfaim and aim
 .0.13
         Changed startup message for new mailing list
         blist now prints AIM info even if .anyone is unreadable
         Catch SIGPIPE and print an error rather than crashing.
                 [It's possible that this may have some portability
                 issues under Solaris and we may need to add some
+                [It's possible that this may have some portability
+                issues under Solaris and we may need to add some
                 configure stuff around SA_SIGINFO...]
         Handle the case in aim_bstream_send where aim_send returns -1,
 …
         Un-word-wrap text when sending AIM messages.
         Replace the main loop continue in the keyboard handler with an else.
 .0.12
         Command history now doesn't allow the last entry
 …
         Print an error message if trying an invalid color for a filter
         Fixed bug causing > not to go to end of editwin every time
 .0.11
         Updated basic help
 …
         Zpunt now works with weird regex characters
         Smart filters now work with weird regex characters
 .0.10
         Allow 'hostname' in filters.
 …
         An admin message is displayed when you are logged out of AIM
         Print an error message and admin message if an AIM send fails
 .0.9
         Added the 'fancylines' variable.
 …
         Added command "show errors"
         Fixed bug removing newlines in backup files
 .0.8
         Increased size of screen name field in buddy listing
 …
         Add owl::login and owl::auth to legacy variables populated for format_msg.
         Additions to intro.txt and advanced.txt documents.  (Still in progress.)
         Add base methods for login_host and login_tty
+        Add base methods for login_host and login_tty
                 and others that return undef.
         New API for perl message formatting functions.
+        New API for perl message formatting functions.
                 Legacy variables are still supported for owl::format_msg
                 and owl::receive_msg, but these functions are now also
+                and owl::receive_msg, but these functions are now also
                 passed an owl::Message object which contains methods
                 for accessing the contents of the message.  See perlwrap.pm
+                for accessing the contents of the message.  See perlwrap.pm
                 (and docs TBD) for the available methods.
                 *** WARNING:  The exact API for owl::Message has
 …
         When perl throws an error, the message is put in the msgwin
                 if possible.
         Added perl functions for:
+        Added perl functions for:
                 owl::getcurmsg() -- returns an owl::Message object for
                                     the active message
 …
                 owl::zephyr_getrealm() -- returns the zephyr realm
                 owl::zephyr_getsender() -- returns the zephyr sender
         Made owl::COMMAND("foo"); be syntactic sugar for
+        Made owl::COMMAND("foo"); be syntactic sugar for
                 owl::command("COMMAND foo");
         Added perlwrap.pm to contain perl code to be compiled into
+        Added perlwrap.pm to contain perl code to be compiled into
                 the binary.  This is transformed into perlwrap.c by
                 encapsulate.pl.
 …
         Improved status command
         Fixed bug in buddy stuff
 .0.6
         aimlogin will now accept the screenname without a password and ask
 …
         Reformatted editwin.c and added capability of doing password-style
            echoing
 .0.5
         Fix in finding des for building zcrypt
 …
         Added hostname and tty name to LOGIN/LOGOUT zephyrs on oneline
           style
 .0.4
         Made command line option -n actually work
 …
         Translate &lt; &gt; &amp; &quot; &nbsp; &ensp, &emsp, &endash and
            &emdash
 .0.3
         Don't ring the terminal bell on mail messages.
 …
         Fixed a bug in fmtext
         Expanded the size of the hostname buffer
 .0.2
         Fixed bug in 'startup' command.
 …
         Disabled 'addbuddy' and 'delbuddy' for aim since it doesn't work yet
         Hacked the Perl build stuff not to link with iconv
 .2.8
         Class pings are displayed differently now
         Updated owlconf.simple example to format outgoing messages.
 .2.7
         Outgoing messages now go through the config for formatting
 …
         Started implementing zcrypt command
         More updates to the intro doc
 .2.6
         Started adding code for newmsgproc.  It doesn't fully work yet!
 …
         Implemented the dump command
         New startup message
 .2.5
         Patch to fix memory bug in replying to CC messages
 …
         Cast to an int for isspace, to make gcc -Wall quiet
         Added 'zlist' and 'l' to basic help.
 .2.4
         'zlog in' will now take an optional thrid argument to set the
 …
         Made daemon.webzephyr a special case for smartstrip
         Added 'out' as a default filter for outgoing messages
 .2.3
         Added filters "ping", "auto" and "login" by default.
 …
         Print the zsig used for outgoing messages
         The tty variable now controls the zephyr location tty name
 .2.2
         Added the 'search' command.
 …
              When switching from an empty view to one we've previously
              been in, the new current message position will attempt
              to be close to the current position from the last
+             to be close to the current position from the last
              time we visited that view.
         Fixed bug in readconfig.c that prevented building under perl 5.005.
 …
         New framework for command handling.
         New framework for keymap handling.
         Added commands for everything that is bound
+        Added commands for everything that is bound
              to a key (do 'show commands' to get the full list).
         Added 'multi' and '(' commands to allow multiple commands
              to be specified on a line.
+             to be specified on a line.
         Added user keybindings with bindkey command.
         Added command aliases (eg, "alias foo bar").
 …
         C-t will transpose characters
         Fix the scrolling bug where we would sometimes fail to scroll
              the screen down, leaving the current message off
+             the screen down, leaving the current message off
              the bottom of the screen.
         Refixed 'login or login' typo in help
 …
         Added owl_sprintf which returns the formatted string, or NULL.
                 The caller must free this string.
                 This will allocate enough memory and thus
+                This will allocate enough memory and thus
                 avoid potential some buffer overrun situations.
         Simple implementation of 'zwrite -m' (doesn't yet log an outgoing
                 message as having been sent.)
         The "Not logged in or subscribing to messages" error
+        The "Not logged in or subscribing to messages" error
                 now includes the name of the recipient.
         The "disable-ctrl-d" variable may also be set to "middle"
                 which will result in ctrl-d only sending at the
+                which will result in ctrl-d only sending at the
                 end of the message.  This is now the default.
                 This also added a command "editmulti:done-or-delete".
 …
                 The M-n and M-p keys will cycle through the history ring.
                 In particular, it is now possible to edit the command line
                 of a zephyr being composed:  C-c it and restart it
+                of a zephyr being composed:  C-c it and restart it
                 and then M-p to get the aborted composition back.
         Added owl::send_zwrite(command, message) to the perl glue
                 to allow for the direct sending of multi-line messages.
                 For example:  owl::send_zwrite("-c foo -i bar", "hello");
         Changed owl_fmtext_print_plain to return an alloc'd string to
+                For example:  owl::send_zwrite("-c foo -i bar", "hello");
+        Changed owl_fmtext_print_plain to return an alloc'd string to
                 avoid buffer overrun risks.
         Added owl::ztext_stylestrip("...") function to perlglue
+        Added owl::ztext_stylestrip("...") function to perlglue
                  which returns the ztext with formatting stripped out.
         Added colorztext variable which can be used to disable @color()
 …
         Added opera to the allowed options to the webbrowser variable.
         Fixed some buffer overruns in the "reply" command.
         When repying to "all" on a message that begins with "CC:" (eg, sent
+        When repying to "all" on a message that begins with "CC:" (eg, sent
                  with "zwrite -C", the reply line will be constructed
                  from the sender and the usernames on the CC: line
 …
         Added --no-move option to delete command.
                 In particular, delete-and-always-move-down may now
                 be implemented with
+                be implemented with
                 '( delete --no-move ; next --skip-deleted )'.
         Folded the nextmsg and prevmsg commands and functions together into
+        Folded the nextmsg and prevmsg commands and functions together into
                 one command which takes arguments.
                 Added '--filter <name>' option (eg, for next_personal),
                 '--skip-deleted' option, and
                 '--last-if-none'/'--first-if-none' options.
                 Help updated accordingly.
                 In particular, the 'personal' filter is now used
                 for 'next personal'.
                 Added --smart-filter and --smart-filter-instance options
+                Help updated accordingly.
+                In particular, the 'personal' filter is now used
+                for 'next personal'.
+                Added --smart-filter and --smart-filter-instance options
                 to the next and prev commands.
         Updated examples/owlconf.erik with the above.
         Made owl_function_fast*filt return a string and not do the
+        Made owl_function_fast*filt return a string and not do the
                 narrowing, to make it more general.
         Added a smartfilter command that creates a filter
                 based on the current message and returns the name
                 of the filter.
         Added M-C-n and M-C-p keybindings to "move to next message
                 matching current" and "move to previous message
+        Added M-C-n and M-C-p keybindings to "move to next message
+                matching current" and "move to previous message
                 matching current"
         Added variables edit:maxfillcols and edit:maxwrapcols which
+        Added variables edit:maxfillcols and edit:maxwrapcols which
                 will limit how wide editing paragraphs may get before
                 they get wrapped.  This is a max and may be narrower
 …
                 edit:maxfillcols and unlimited for edit:maxwrapcols.
         Added smartzpunt command with key binding of "C-x k".
                 This starts a zpunt command filled in with
+                This starts a zpunt command filled in with
                 the proposed zpunt.
         Fixed a memory reference bug in delete and undelete commands.
 …
                 call back into owl.  This allows perl to get the return
                 value of strings returned by owl commands.
         Added the getview command which returns the name of the current
                 view's filter.
+        Added the getview command which returns the name of the current
+                view's filter.
         Added the getvar command which returns the value of a variable.
         Added an example to examples/owlconf.erik which uses TAB to
                 narrow and restore the view.
         Added an example to examples/owlconf.erik which uses M-c to
+        Added an example to examples/owlconf.erik which uses TAB to
+                narrow and restore the view.
+        Added an example to examples/owlconf.erik which uses M-c to
                 color messages matching the current one green.
         Integrated change to fix problem with popup blinking on new zephyrs.
 …
                 and new show commands.
         Show with arguments produces help on show.
         Fix a bug in readconfig caught by efence (where we'd try to read before
+        Fix a bug in readconfig caught by efence (where we'd try to read before
                 the beginning of a string if it was empty).
         The perl command doesn't do makemsg directly, but instead
              returns the string and it will get printed if it
+             returns the string and it will get printed if it
              was run interactively.
 .1.3
         'show subs' and 'show subscriptions' are now the same as 'getsubs'
 …
         Include login/logout messages in auto user filters
         'V' changes to the home view ('all' by default)
 .1.1
         Fixed perl, aperl, and pperl commands to deal with quoting
+        Fixed perl, aperl, and pperl commands to deal with quoting
               and spaces in a saner manner.
         Removed all owl_get_* methods for booleans and switched
               cases where they were used to owl_is_*
+              cases where they were used to owl_is_*
         Changes to owlconf.erik to use some new features.
         Increased the size of the help buffer (as it
+        Increased the size of the help buffer (as it
               was overflowing and truncating the help message).
         Variables prefixed with a _ are not shown in help
               or by printallvars (and prefixed Not Yet Implemented
+              or by printallvars (and prefixed Not Yet Implemented
               variables with this).
         Fix typo in help
 …
         display admin message time in 'info' command
         fixed an editwin M-> last character bug
 .1
         reply is a normal function now
 …
         Fixed an arg checking bug in delete command
         Added owl::id to perl namespace with message id
         Fixed a memory corruption bug in readconfig.c (where right
+        Fixed a memory corruption bug in readconfig.c (where right
               after the strdup to "out", we'd strcat a \n onto the end.
               This would be triggered whenever owl::format_msg returned
               a string not ending in a newline
         Added 'X' keybinding which expunges and then switches to
               a view defined by the variable "view_home" which defaults
+        Added 'X' keybinding which expunges and then switches to
+              a view defined by the variable "view_home" which defaults
               to "all"
         Consolidated readconfig.c somewhat to remove duplication.
 …
               are generated from variable.c by stubgen.pl.
               The help.c messages for variables now calls into variable.c
               so all information about most variables is in one place.
+              so all information about most variables is in one place.
         Cleaned out code from global.c and command.c that was made obselete
               by variable overhaul.
         The set command now takes a -q option to not log a message.
         Fixed a bug where set and print with no arguments would
               print "Undefined variable" in addition
+              print "Undefined variable" in addition
               to running owl_function_printallvars.
         debug is now a variable that can be turned on and off.
         Fixed mail,inbox message parsing in examples/owlconf.erik
         Made zaway_msg and zaway_msg_default into variables
         Changed owl_function_makemsg and owl_function_debugmsg
+        Made zaway_msg and zaway_msg_default into variables
+        Changed owl_function_makemsg and owl_function_debugmsg
                to use varargs (ie, so they can now take a format
                string with args).
 …
         Added doc/code.txt which gives a brief overview of the code.
         Added tags makefile rule and added TAGS to distclean rule.
 .0.1
         fix frees in loadsubs and loadloginsubs
         don't return in owl_free
 .0
         'print' and 'set' with no arguments prints all variables
 …
         you can now reply to an admin message
         don't display an error about keypress on window resize
 .11
         fixed bug in viewing messages longer than the screen
 …
         change malloc, realloc, strdup and free to use owl hooks so that
            debugging can be added
 .10.1
         fixed a trailing space bug in the parser
 …
         fixed bug in reporting which M- key was pressed
         C-g will now cancel commands like C-c
 .10
         implemented owl_function_full_redisplay().
 …
         some build cleanup
 .9
         added owl_message_is_personal and have things use it
 …
         added smart bolding and userclue
         fixed a bug causing pings to beep even if rxping is off
 .8.1
         fixed bug in logging code
 .8
         implemented personal logging
 …
         fixed the backspace problem
         -v command line option prints the version number
 .7
         load-subs will report error opening file
 …
         added displayoutgoing variable
         temporarily removed error printing for zlog in / out
 .61
         fixed bug in "message sent to <foo>" for zwrite
 .6
         help updated
 …
         personal bell variable
         beta message now an admin message
 .5
         Added the debug command and flag

aim.c

-                      rf271129
+                      r7869e48
    * future.  It's still called by Owl.
    */
+}
 …
   aim_setdebuggingcb(sess, faimtest_debugcb);
   aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL);
   /* this will leak, I know and just don't care right now */
   priv=g_new0(struct owlfaim_priv, 1);
 …
   */
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0);
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
 …
   /* aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0); */
   /* aim_conn_addhandler(sess, conn, 0x0017, 0x0003, gaim_parse_auth_resp, 0); */
   /* start processing AIM events */
   owl_global_set_doaimevents(&g);
 …
   owl_function_debugmsg("owl_aim_search: doing search for %s", email);
   ret=aim_search_address(owl_global_get_aimsess(&g),
+  ret=aim_search_address(owl_global_get_aimsess(&g),
                          aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_BOS),
                          email);
 …
     len=499;
+  }
   aim_locate_setprofile(owl_global_get_aimsess(&g),
                         NULL, NULL, 0,
 …
   aim_bos_setprofile(owl_global_get_aimsess(&g),
                      owl_global_get_bosconn(&g),
                      NULL, NULL, 0, "us-ascii", msg,
+                     NULL, NULL, 0, "us-ascii", msg,
                      strlen(msg), 0);
   */
 …
                                aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV), name, exchange);
    ret=aim_chat_join(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), exchange, name, 0x0000);
+}
 …
   if (selstat == -1) {
     owl_aim_logged_out();
   } else if (selstat == 0) {
+  } else if (selstat == 0) {
     /* no events pending */
   } else if (selstat == 1) { /* outgoing data pending */
 …
   } else if (selstat == 2) { /* incoming data pending */
     /* printf("selstat == 2\n"); */
     if (aim_get_command(aimsess, waitingconn) >= 0) {
       aim_rxdispatch(aimsess);
 …
   struct owlfaim_priv *priv = sess->aux_data;
   struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD;
   const char *key;
   va_list ap;
 …
   aim_send_login(sess, fr->conn, priv->screenname, priv->password, &info, key);
   return(1);
+}
 …
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOK, 0x0003, faimtest_parse_searchreply, 0);
   */
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR,              faimtest_parse_msgerr, 0);
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO,           faimtest_parse_userinfo, 0);
 …
   fu16_t code;
   const char *msg;
   va_start(ap, fr);
   code = va_arg(ap, int);
   msg = va_arg(ap, const char *);
   va_end(ap);
   owl_function_error("faimtest_parse_connerr: Code 0x%04x: %s\n", code, msg);
   aim_conn_kill(sess, &fr->conn); /* this will break the main loop */
   priv->connected = 0;
   return 1;
+}
 …
   int status;
   va_list ap;
   va_start(ap, fr);
   status = va_arg(ap, int); /* status code of confirmation request */
 …
   /* owl_function_debugmsg("faimtest_accountconfirm: Code 0x%04x: %s\n", code, msg); */
   owl_function_debugmsg("faimtest_accountconfirm: account confirmation returned status 0x%04x (%s)\n", status, (status==0x0000)?"email sent":"unknown");
   return 1;
+}
 …
   const char *val;
   va_list ap;
   va_start(ap, fr);
   change = va_arg(ap, int);
 …
   str = va_arg(ap, int);
   va_end(ap);
   owl_function_debugmsg("faimtest_infochange: info%s: perms = %d, type = %x, length = %d, val = %s", change?" change":"", perms, type, length, str?val:"(not string)");
   return(1);
+}
 …
   owl_function_debugmsg("faimtest_handledirect:");
   va_start(ap, fr);
   redir = va_arg(ap, struct aim_redirect_data *);
   if (redir->group == 0x0005) {  /* Adverts */
   } else if (redir->group == 0x0007) {  /* Authorizer */
     aim_conn_t *tstconn;
     owl_function_debugmsg("faimtest_handledirect: autorizer");
     tstconn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, redir->ip);
     if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
 …
   struct aim_icbmparameters *params;
   va_list ap;
   va_start(ap, fr);
   params = va_arg(ap, struct aim_icbmparameters *);
   va_end(ap);
   owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %u",
                        params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval);
   /*
   * Set these to your taste, or client medium.  Setting minmsginterval
 …
   /* aim_seticbmparam(sess, params); */
   aim_im_setparams(sess, params);
   return 1;
+}
 …
   va_list ap;
   fu16_t maxbuddies, maxwatchers;
   va_start(ap, fr);
   maxbuddies = va_arg(ap, int);
   maxwatchers = va_arg(ap, int);
   va_end(ap);
   owl_function_debugmsg("faimtest_parse_buddyrights: Max buddies = %d / Max watchers = %d\n", maxbuddies, maxwatchers);
   /* aim_ssi_reqrights(sess, fr->conn); */
   aim_ssi_reqrights(sess);
   return 1;
+}
 …
   va_list ap;
   fu16_t maxpermits, maxdenies;
   va_start(ap, fr);
   maxpermits = va_arg(ap, int);
   maxdenies = va_arg(ap, int);
   va_end(ap);
   owl_function_debugmsg("faimtest_bosrights: Max permit = %d / Max deny = %d\n", maxpermits, maxdenies);
   aim_clientready(sess, fr->conn);
 …
   va_list ap;
   fu16_t maxsiglen;
   va_start(ap, fr);
   maxsiglen = va_arg(ap, int);
 …
   owl_function_debugmsg("faimtest_locrights: rights: max signature length = %d\n", maxsiglen);
   return(1);
+}
 …
   owl_function_debugmsg("faimtest_parse_motd: %s (%d / %s)\n", msg?msg:"nomsg", id, (id < codeslen)?codes[id]:"unknown");
   return 1;
+}
 …
   if (flags & AIM_FLAG_WIRELESS) printf("WIRELESS ");
   if (flags & AIM_FLAG_ACTIVEBUDDY) printf("ACTIVEBUDDY ");
   return;
+}
 …
 static int faimtest_parse_incoming_im_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args)
+{
   /*
+  /*
   printf("rendezvous: source sn = %s\n", userinfo->sn);
   printf("rendezvous: \twarnlevel = %f\n", aim_userinfo_warnlevel(userinfo));
 …
   printuserflags(userinfo->flags);
   printf("\n");
   printf("rendezvous: \tonlinesince = %lu\n", userinfo->onlinesince);
   printf("rendezvous: \tidletime = 0x%04x\n", userinfo->idletime);
   printf("rendezvous: message/description = %s\n", args->msg);
   printf("rendezvous: encoding = %s\n", args->encoding);
   printf("rendezvous: language = %s\n", args->language);
   */
   if (args->reqclass == AIM_CAPS_SENDFILE) {
     owl_function_debugmsg("faimtest_parse_incoming_im_chan2: send file!");
 …
   va_list ap;
   int ret = 0;
   va_start(ap, fr);
   channel = (fu16_t)va_arg(ap, unsigned int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   if (channel == 1) {
     struct aim_incomingim_ch1_args *args;
 …
   nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
   owl_buddylist_oncoming(owl_global_get_buddylist(&g), nz_screenname);
 …
     owl_function_debugmsg("parse_oncoming sn: %s away flag!", userinfo->sn);
+  }
   owl_function_debugmsg("parse_oncoming sn: %s idle: %i", userinfo->sn, userinfo->idletime);
   g_free(nz_screenname);
   /*
     printf("%ld  %s is now online (flags: %04x = %s%s%s%s%s%s%s%s) (caps = %s = 0x%08lx)\n",
 …
   char *nz_screenname;
   va_list ap;
   va_start(ap, fr);
   userinfo = va_arg(ap, aim_userinfo_t *);
 …
          userinfo->capabilities);
   */
   return 1;
+}
 …
   va_list ap;
   fu16_t reason;
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   va_end(ap);
   /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
   return 1;
+}
 …
   const char *destsn;
   fu16_t reason;
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   destsn = va_arg(ap, const char *);
   va_end(ap);
   /* printf("message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
 …
     owl_function_adminmsg("", "Could not send AIM message, user not logged on");
+  }
   return 1;
+}
 …
   const char *destsn;
   fu16_t reason;
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   destsn = va_arg(ap, const char *);
   va_end(ap);
   /* printf("user information for %s unavailable (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
   return 1;
+}
 …
   };
   static int missedreasonslen = 5;
   va_list ap;
   fu16_t chan, nummissed, reason;
   aim_userinfo_t *userinfo;
   va_start(ap, fr);
   chan = (fu16_t)va_arg(ap, unsigned int);
 …
   reason = (fu16_t)va_arg(ap, unsigned int);
   va_end(ap);
   owl_function_debugmsg("faimtest_parse_misses: missed %d messages from %s on channel %d (reason %d: %s)\n", nummissed, userinfo->sn, chan, reason, (reason<missedreasonslen)?missedreasons[reason]:"unknown");
   return 1;
+}
 …
   fu16_t type;
   const char *sn = NULL;
   va_start(ap, fr);
   type = (fu16_t)va_arg(ap, unsigned int);
   sn = va_arg(ap, const char *);
   va_end(ap);
   owl_function_debugmsg("faimtest_parse_msgack: 0x%04x / %s\n", type, sn);
   return 1;
+}
 …
   fu32_t windowsize, clear, alert, limit, disconnect;
   fu32_t currentavg, maxavg;
   va_start(ap, fr);
+  va_start(ap, fr);
   /* See code explanations below */
   code = (fu16_t)va_arg(ap, unsigned int);
   /*
    * See comments above aim_parse_ratechange_middle() in aim_rxhandlers.c.
    */
   rateclass = (fu16_t)va_arg(ap, unsigned int);
   /*
    * Not sure what this is exactly.  I think its the temporal
+  /*
+   * Not sure what this is exactly.  I think its the temporal
    * relation factor (ie, how to make the rest of the numbers
    * make sense in the real world).
+   * make sense in the real world).
    */
   windowsize = va_arg(ap, fu32_t);
   /* Explained below */
   clear = va_arg(ap, fu32_t);
 …
   currentavg = va_arg(ap, fu32_t);
   maxavg = va_arg(ap, fu32_t);
   va_end(ap);
+  va_end(ap);
   owl_function_debugmsg("faimtest_parse_ratechange: rate %s (rate class 0x%04x): curavg = %u, maxavg = %u, alert at %u, clear warning at %u, limit at %u, disconnect at %u (window size = %u)",
                         (code < 5)?codes[code]:"invalid",
 …
   fu16_t newevil;
   aim_userinfo_t *userinfo;
   va_start(ap, fr);
   newevil = (fu16_t)va_arg(ap, unsigned int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   va_end(ap);
   /*
    * Evil Notifications that are lacking userinfo->sn are anon-warns
 …
    */
   owl_function_debugmsg("faimtest_parse_evilnotify: new value = %2.1f%% (caused by %s)\n", ((float)newevil)/10, (userinfo && strlen(userinfo->sn))?userinfo->sn:"anonymous");
   return 1;
+}
 …
   int num, i;
   GPtrArray *list;
   va_start(ap, fr);
   address = va_arg(ap, const char *);
 …
   list = g_ptr_array_new();
   owl_function_debugmsg("faimtest_parse_searchreply: E-Mail Search Results for %s: ", address);
   for (i=0; i<num; i++) {
 …
   va_list ap;
   const char *address;
   va_start(ap, fr);
   address = va_arg(ap, const char *);
 …
   owl_function_error("No results searching for %s", address);
   owl_function_debugmsg("faimtest_parse_searcherror: E-Mail Search Results for %s: No Results or Invalid Email\n", address);
   return(1);
+}
 …
   const char *msg, *url;
   fu16_t width, height, delay;
   va_start(ap, fr);
   msg = va_arg(ap, const char *);
 …
   delay = va_arg(ap, unsigned int);
   va_end(ap);
   owl_function_debugmsg("handlepopup: (%dx%x:%d) %s (%s)\n", width, height, delay, msg, url);
   return 1;
+}
 …
   const char *bosip;
   fu8_t *cookie;
   va_start(ap, fr);
   bosip = va_arg(ap, const char *);
   cookie = va_arg(ap, fu8_t *);
   va_end(ap);
   owl_function_debugmsg("migrate: migration in progress -- new BOS is %s -- disconnecting", bosip);
   aim_conn_kill(sess, &fr->conn);
   if (!(bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, bosip))) {
     owl_function_debugmsg("migrate: could not connect to BOS: internal error");
     return 1;
   } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
+  } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
     owl_function_debugmsg("migrate: could not connect to BOS");
     aim_conn_kill(sess, &bosconn);
     return 1;
+  }
   /* Login will happen all over again. */
   addcb_bos(sess, bosconn);
 …
   /* aim_ssi_reqdata(sess, fr->conn, 0, 0x0000); */
   aim_ssi_reqdata(sess);
   return(1);
+}
 …
   struct aim_ssi_item *l;
   */
   va_start(ap, fr);
   fmtver = va_arg(ap, unsigned int);
 …
   list = va_arg(ap, struct aim_ssi_item *);
   va_end(ap);
   owl_function_debugmsg("ssiddata: got SSI data (0x%02x, %d items, %u)", fmtver, itemcount, stamp);
   /*
 …
   */
   aim_ssi_enable(sess);
   return 1;
+}
 …
   va_list ap;
   struct aim_icq_offlinemsg *msg;
   va_start(ap, fr);
   msg = va_arg(ap, struct aim_icq_offlinemsg *);
   va_end(ap);
   if (msg->type == 0x0001) {
     owl_function_debugmsg("offlinemsg: from %u at %d/%d/%d %02d:%02d : %s", msg->sender, msg->year, msg->month, msg->day, msg->hour, msg->minute, msg->msg);
 …
   int count;
   /* int i; */
   va_start(ap, fr);
   count = va_arg(ap, int);
 …
   /* int i; */
   va_start(ap, fr);
   count = va_arg(ap, int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   va_end(ap);
   /*
     printf("chat: %s:  Some occupants have left:\n", aim_chat_getname(fr->conn));
     for (i = 0; i < count; i++)
     printf("chat: %s: \t%s\n", aim_chat_getname(fr->conn), userinfo[i].sn);
 …
   const char *croomname;
   /* int i; */
   croomname = aim_chat_getname(fr->conn);
   va_start(ap, fr);
   roominfo = va_arg(ap, struct aim_chat_roominfo *);
 …
   for (i = 0; i < usercount; i++)
     printf("chat: %s:  \t\t%s\n", croomname, userinfo[i].sn);
   owl_function_debugmsg("chat: %s:  \tRoom flags: 0x%04x (%s%s%s%s)\n",
+  owl_function_debugmsg("chat: %s:  \tRoom flags: 0x%04x (%s%s%s%s)\n",
          croomname, flags,
          (flags & AIM_CHATROOM_FLAG_EVILABLE) ? "Evilable, " : "",
 …
   printf("chat: %s:  \tMax visible message length: %d bytes\n", croomname, maxvisiblemsglen);
   */
   return(1);
+}
 …
   const char *msg;
   char tmpbuf[1152];
   va_start(ap, fr);
   userinfo = va_arg(ap, aim_userinfo_t *);
+  va_start(ap, fr);
+  userinfo = va_arg(ap, aim_userinfo_t *);
   msg = va_arg(ap, const char *);
   va_end(ap);
 …
   printf("chat: %s: incoming msg from %s: %s\n", aim_chat_getname(fr->conn), userinfo->sn, msg);
   */
   /*
    * Do an echo for testing purposes.  But not for ourselves ("oops!")
 …
     aim_chat_send_im(sess, fr->conn, 0, tmpbuf, strlen(tmpbuf));
+  }
   return 1;
+}
 …
   aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, faimtest_chat_infoupdate, 0);
   aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, faimtest_chat_incomingmsg, 0);
   aim_clientready(sess, fr->conn);
   owl_function_debugmsg("Chat ready");
 …
   owl_function_debugmsg("in faimtest_chatnav_redirect");
   tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, redir->ip);
   if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
 …
     return;
+  }
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
 …
   owl_function_debugmsg("in chat_redirect");
   tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHAT, redir->ip);
   if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
     /* printf("unable to connect to chat server\n"); */
     if (tstconn) aim_conn_kill(sess, &tstconn);
     return;
+  }
+    return;
+  }
   /* printf("chat: connected to %s instance %d on exchange %d\n", redir->chat.room, redir->chat.instance, redir->chat.exchange); */
   /*
    * We must do this to attach the stored name to the connection!
 …
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
   aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
   return;
+  return;
+}

buddylist.c

r3cdd6d2	r7869e48
12	12	owl_buddy *b;
13	13	b=g_new(owl_buddy, 1);
14
	14
15	15	owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
16	16	g_ptr_array_add(bl->buddies, b);

cmd.c

-                      rf271129
+                      r7869e48
     owl_function_makemsg("Unbalanced quotes");
     return NULL;
+  }
+  }
   if (argc < 1) {
     g_strfreev(argv);
 …
+}
 int owl_cmd_is_context_valid(const owl_cmd *cmd, const owl_context *ctx) {
+int owl_cmd_is_context_valid(const owl_cmd *cmd, const owl_context *ctx) {
   if (owl_context_matches(ctx, cmd->validctx)) return 1;
   else return 0;
 …
       rv = owl_function_command(newcmd);
       g_free(newcmd);
+    }
+    }
     alias_recurse_depth--;
     return rv;
 …
   if (cmd->cmd_args_fn) {
     return cmd->cmd_args_fn(argc, argv, cmdbuff);
   } else if (cmd->cmd_v_fn) {
+  } else if (cmd->cmd_v_fn) {
     cmd->cmd_v_fn();
   } else if (cmd->cmd_i_fn) {
 …
   } else if (cmd->cmd_ctxargs_fn) {
     return cmd->cmd_ctxargs_fn(owl_context_get_data(ctx), argc, argv, cmdbuff);
   } else if (cmd->cmd_ctxv_fn) {
+  } else if (cmd->cmd_ctxv_fn) {
     cmd->cmd_ctxv_fn(owl_context_get_data(ctx));
   } else if (cmd->cmd_ctxi_fn) {
 …
+  }
   owl_fmtext_append_normal(fm, "\n\n");
+}
+  owl_fmtext_append_normal(fm, "\n\n");
+}

codelist.pl

r06adc25	r7869e48
29	29	print;
30	30	}
31
	31
32	32	}
33	33	close(FILE);

commands.c

-                      r39a531d
+                      r7869e48
               "",
               ""),
   OWLCMD_ARGS("start-command", owl_command_start_command, OWL_CTX_INTERACTIVE,
               "prompts the user to enter a command",
 …
               "send an AIM message",
               "aimwrite <user> [-m <message...>]",
               "Send an aim message to a user.\n\n"
+              "Send an aim message to a user.\n\n"
               "The following options are available:\n\n"
               "-m    Specifies a message to send without prompting.\n"),
 …
               "Behaves like zwrite but uses encryption.  Not for use with\n"
               "personal messages\n"),
   OWLCMD_ARGS("reply", owl_command_reply,  OWL_CTX_INTERACTIVE,
               "reply to the current message",
 …
   OWLCMD_VOID("unsuball", owl_command_unsuball, OWL_CTX_ANY,
               "unsubscribe from all zephyrs", "", ""),
   OWLCMD_VOID("getsubs", owl_command_getsubs, OWL_CTX_ANY,
               "print all current subscriptions",
 …
               "display detailed information about the current message",
               "", ""),
   OWLCMD_ARGS("help", owl_command_help, OWL_CTX_INTERACTIVE,
               "display help on using BarnOwl",
 …
               "scrolls receive window to specified position", "", ""),
   OWLCMD_VOID("recv:pagedown", owl_function_mainwin_pagedown,
+  OWLCMD_VOID("recv:pagedown", owl_function_mainwin_pagedown,
               OWL_CTX_INTERACTIVE,
               "scrolls down by a page", "", ""),
 …
   OWLCMD_INT ("recv:scroll", owl_function_page_curmsg, OWL_CTX_INTERACTIVE,
               "scrolls current message up or down",
               "recv:scroll <numlines>",
+              "scrolls current message up or down",
+              "recv:scroll <numlines>",
               "Scrolls the current message up or down by <numlines>.\n"
               "Scrolls up if <numlines> is negative, else scrolls down.\n"),
 …
   OWLCMD_VOID("last", owl_command_last, OWL_CTX_INTERACTIVE,
               "move the pointer to the last message", "",
+              "move the pointer to the last message", "",
               "Moves the pointer to the last message in the view.\n"
               "If we are already at the last message in the view,\n"
 …
   OWLCMD_VOID("status", owl_command_status, OWL_CTX_ANY,
               "print status information about the running BarnOwl", "", ""),
   OWLCMD_ARGS("zlocate", owl_command_zlocate, OWL_CTX_INTERACTIVE,
               "locate a user",
               "zlocate [-d] <user> ...",
+              "zlocate [-d] <user> ...",
               "Performs a zlocate on one ore more users and puts the result\n"
               "int a popwin.  If -d is specified, does not authenticate\n"
               "the lookup request.\n"),
   OWLCMD_ARGS("filter", owl_command_filter, OWL_CTX_ANY,
               "create a message filter",
 …
               "Show errors will show a list of errors encountered by BarnOwl.\n\n"
               "SEE ALSO: filter, view, alias, bindkey, help\n"),
   OWLCMD_ARGS("delete", owl_command_delete, OWL_CTX_INTERACTIVE,
               "mark a message for deletion",
 …
   /****************************************************************/
   OWLCMD_VOID_CTX("edit:move-next-word", owl_editwin_move_to_nextword,
+  OWLCMD_VOID_CTX("edit:move-next-word", owl_editwin_move_to_nextword,
                   OWL_CTX_EDIT,
                   "moves cursor forward a word",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-prev-word", owl_editwin_move_to_previousword,
+  OWLCMD_VOID_CTX("edit:move-prev-word", owl_editwin_move_to_previousword,
                   OWL_CTX_EDIT,
                   "moves cursor backwards a word",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-to-buffer-end", owl_editwin_move_to_end,
+  OWLCMD_VOID_CTX("edit:move-to-buffer-end", owl_editwin_move_to_end,
                   OWL_CTX_EDIT,
                   "moves cursor to the bottom right (end) of the buffer",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-to-line-end", owl_editwin_move_to_line_end,
+  OWLCMD_VOID_CTX("edit:move-to-line-end", owl_editwin_move_to_line_end,
                   OWL_CTX_EDIT,
                   "moves cursor to the end of the line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-to-line-start", owl_editwin_move_to_line_start,
+  OWLCMD_VOID_CTX("edit:move-to-line-start", owl_editwin_move_to_line_start,
                   OWL_CTX_EDIT,
                   "moves cursor to the beginning of the line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-left", owl_editwin_key_left,
+  OWLCMD_VOID_CTX("edit:move-left", owl_editwin_key_left,
                   OWL_CTX_EDIT,
                   "moves the cursor left by a character",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:delete-next-char", owl_editwin_delete_char,
+  OWLCMD_VOID_CTX("edit:delete-next-char", owl_editwin_delete_char,
                   OWL_CTX_EDIT,
                   "deletes the character to the right of the cursor",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:delete-all", owl_editwin_clear,
+  OWLCMD_VOID_CTX("edit:delete-all", owl_editwin_clear,
                   OWL_CTX_EDIT,
                   "deletes all of the contents of the buffer",
 …
                   "", ""),
   OWLCMD_VOID_CTX("edit:fill-paragraph", owl_editwin_fill_paragraph,
+  OWLCMD_VOID_CTX("edit:fill-paragraph", owl_editwin_fill_paragraph,
                   OWL_CTX_EDIT,
                   "fills the current paragraph to line-wrap well",
                   "", ""),
   OWLCMD_VOID_CTX("edit:recenter", owl_editwin_recenter,
+  OWLCMD_VOID_CTX("edit:recenter", owl_editwin_recenter,
                   OWL_CTX_EDIT,
                   "recenters the buffer",
                   "", ""),
   OWLCMD_ARGS_CTX("edit:insert-text", owl_command_edit_insert_text,
+  OWLCMD_ARGS_CTX("edit:insert-text", owl_command_edit_insert_text,
                   OWL_CTX_EDIT,
                   "inserts text into the buffer",
                   "edit:insert-text <text>", ""),
   OWLCMD_VOID_CTX("edit:cancel", owl_command_edit_cancel,
+  OWLCMD_VOID_CTX("edit:cancel", owl_command_edit_cancel,
                   OWL_CTX_EDIT,
                   "cancels the current command",
                   "", ""),
   OWLCMD_VOID_CTX("edit:history-next", owl_command_edit_history_next,
+  OWLCMD_VOID_CTX("edit:history-next", owl_command_edit_history_next,
                   OWL_CTX_EDIT,
                   "replaces the text with the next history",
                   "", ""),
   OWLCMD_VOID_CTX("edit:history-prev", owl_command_edit_history_prev,
+  OWLCMD_VOID_CTX("edit:history-prev", owl_command_edit_history_prev,
                   OWL_CTX_EDIT,
                   "replaces the text with the previous history",
 …
   OWLCMD_ALIAS   ("editresponse:done", "edit:done"),
   OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up,
+  OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up,
                   OWL_CTX_EDITMULTI,
                   "moves the cursor up one line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:move-down-line", owl_editwin_key_down,
+  OWLCMD_VOID_CTX("edit:move-down-line", owl_editwin_key_down,
                   OWL_CTX_EDITMULTI,
                   "moves the cursor down one line",
                   "", ""),
   OWLCMD_VOID_CTX("edit:done", owl_command_edit_done,
+  OWLCMD_VOID_CTX("edit:done", owl_command_edit_done,
                   OWL_CTX_EDIT,
                   "Finishes entering text in the editwin.",
                   "", ""),
   OWLCMD_VOID_CTX("edit:done-or-delete", owl_command_edit_done_or_delete,
+  OWLCMD_VOID_CTX("edit:done-or-delete", owl_command_edit_done_or_delete,
                   OWL_CTX_EDITMULTI,
                   "completes the command, but only if at end of message",
                   "",
+                  "",
                   "If only whitespace is to the right of the cursor,\n"
                   "runs 'edit:done'.\n"\
 …
   /****************************************************************/
   OWLCMD_VOID_CTX("popless:scroll-down-page", owl_viewwin_pagedown,
+  OWLCMD_VOID_CTX("popless:scroll-down-page", owl_viewwin_pagedown,
                   OWL_CTX_POPLESS,
                   "scrolls down one page",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-down-line", owl_viewwin_linedown,
+  OWLCMD_VOID_CTX("popless:scroll-down-line", owl_viewwin_linedown,
                   OWL_CTX_POPLESS,
                   "scrolls down one line",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-up-page", owl_viewwin_pageup,
+  OWLCMD_VOID_CTX("popless:scroll-up-page", owl_viewwin_pageup,
                   OWL_CTX_POPLESS,
                   "scrolls up one page",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-up-line", owl_viewwin_lineup,
+  OWLCMD_VOID_CTX("popless:scroll-up-line", owl_viewwin_lineup,
                   OWL_CTX_POPLESS,
                   "scrolls up one line",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-to-top", owl_viewwin_top,
+  OWLCMD_VOID_CTX("popless:scroll-to-top", owl_viewwin_top,
                   OWL_CTX_POPLESS,
                   "scrolls to the top of the buffer",
                   "", ""),
   OWLCMD_VOID_CTX("popless:scroll-to-bottom", owl_viewwin_bottom,
+  OWLCMD_VOID_CTX("popless:scroll-to-bottom", owl_viewwin_bottom,
                   OWL_CTX_POPLESS,
                   "scrolls to the bottom of the buffer",
                   "", ""),
   OWLCMD_INT_CTX ("popless:scroll-right", owl_viewwin_right,
+  OWLCMD_INT_CTX ("popless:scroll-right", owl_viewwin_right,
                   OWL_CTX_POPLESS,
                   "scrolls right in the buffer",
                   "popless:scroll-right <num-chars>", ""),
   OWLCMD_INT_CTX ("popless:scroll-left", owl_viewwin_left,
+  OWLCMD_INT_CTX ("popless:scroll-left", owl_viewwin_left,
                   OWL_CTX_POPLESS,
                   "scrolls left in the buffer",
                   "popless:scroll-left <num-chars>", ""),
   OWLCMD_VOID_CTX("popless:quit", owl_command_popless_quit,
+  OWLCMD_VOID_CTX("popless:quit", owl_command_popless_quit,
                   OWL_CTX_POPLESS,
                   "exits the popless window",
 …
     return NULL;
+  }
   owl_function_help_for_command(argv[1]);
   return NULL;
 …
+{
   char *filename;
   if (argc!=2) {
     owl_function_makemsg("usage: dump <filename>");
 …
     if (argc>=1 && !strcmp(argv[1], "--skip-deleted")) {
       skip_deleted=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=1 && !strcmp(argv[1], "--last-if-none")) {
       last_if_none=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=2 && !strcmp(argv[1], "--filter")) {
       filter = g_strdup(argv[2]);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
       filter = owl_function_smartfilter(0, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
       filter = owl_function_smartfilter(1, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else {
       owl_function_makemsg("Invalid arguments to command 'next'.");
 …
     if (argc>=1 && !strcmp(argv[1], "--skip-deleted")) {
       skip_deleted=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=1 && !strcmp(argv[1], "--first-if-none")) {
       first_if_none=1;
       argc-=1; argv+=1;
+      argc-=1; argv+=1;
     } else if (argc>=2 && !strcmp(argv[1], "--filter")) {
       filter = g_strdup(argv[2]);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
       filter = owl_function_smartfilter(0, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
       filter = owl_function_smartfilter(1, 0);
       argc-=2; argv+=2;
+      argc-=2; argv+=2;
    } else {
       owl_function_makemsg("Invalid arguments to command 'prev'.");
 …
     filtname = owl_function_smartfilter(1, 0);
   } else {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+  }
   return filtname;
 …
     owl_function_printallvars();
     return NULL;
+  }
+  }
   if (argc > 1 && !strcmp("-q",argv[1])) {
 …
   var=argv[1];
   v = owl_variable_get_var(owl_global_get_vardict(&g), var);
   if (v) {
 …
   int  i;
   if (argc < 2) {
     owl_function_makemsg("Invalid arguments to 'multi' command.");
+    owl_function_makemsg("Invalid arguments to 'multi' command.");
     return NULL;
+  }
 …
         break;
       } else if (newbuff[i] != ' ') {
         owl_function_makemsg("Invalid arguments to 'multi' command.");
+        owl_function_makemsg("Invalid arguments to 'multi' command.");
         g_free(newbuff);
         return NULL;
 …
   const char *const *myargv;
   int myargc;
   if (!owl_global_is_aimloggedin(&g)) {
     owl_function_error("You are not logged in to AIM.");
 …
+{
   int edit=0;
   if (argc>=2 && !strcmp("-e", argv[1])) {
     edit=1;
 …
+  }
   if ((argc==1) || (argc==2 && !strcmp(argv[1], "all"))) {
+  if ((argc==1) || (argc==2 && !strcmp(argv[1], "all"))) {
     owl_function_reply(0, !edit);
   } else if (argc==2 && !strcmp(argv[1], "sender")) {
 …
     const owl_message *m;
     const owl_view    *v;
     v = owl_global_get_current_view(&g);
+    v = owl_global_get_current_view(&g);
     m = owl_view_get_element(v, owl_global_get_curmsg(&g));
     if (m) owl_zephyr_zaway(m);
 …
+{
   int auth;
   if (argc<2) {
     owl_function_makemsg("Too few arguments for zlocate command");
 …
       return(NULL);
+    }
+  }
   return(NULL);
 …
       owl_function_show_filter(argv[2]);
+    }
   } else if (argc==2
+  } else if (argc==2
              && (!strcmp(argv[1], "zpunts") || !strcmp(argv[1], "zpunted"))) {
     owl_function_show_zpunts();
 …
   } else if (!strcmp(argv[1], "startup")) {
     const char *filename;
     filename=owl_global_get_startupfile(&g);
     owl_function_popless_file(filename);
 …
   if (argc>1 && !strcmp(argv[1], "--no-move")) {
     move_after = 0;
     argc--;
+    argc--;
     argv++;
+  }
 …
   if (argc>1 && !strcmp(argv[1], "--no-move")) {
     move_after = 0;
     argc--;
+    argc--;
     argv++;
+  }
 …
+{
   char *filtname;
   if (argc < 3 || argc > 4) {
     owl_function_makemsg("Wrong number of arguments to colorclass command");
 …
     owl_function_smartzpunt(1);
   } else {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+  }
   return NULL;
 …
     buffstart=skiptokens(buff, 2);
+  }
   if (argc==1 || (argc==2 && !strcmp(argv[1], "-r"))) {
     /* When continuing a search, don't consider the current message. */
 …
     owl_function_search_helper(true, direction);
+  }
   return(NULL);
+}
 …
   buffstart=skiptokens(buff, 1);
   owl_function_set_search(*buffstart ? buffstart : NULL);
   return(NULL);
+}

context.c

-                      rf271129
+                      r7869e48
   if ((((ctx->mode&OWL_CTX_MODE_BITS) & test)
        || !(test&OWL_CTX_MODE_BITS))
       &&
       (((ctx->mode&OWL_CTX_ACTIVE_BITS) & test)
+      &&
+      (((ctx->mode&OWL_CTX_ACTIVE_BITS) & test)
        || !(test&OWL_CTX_ACTIVE_BITS))) {
     return 1;

dict.c

-                      rf271129
+                      r7869e48
 /* Dictionary data abstraction.
+/* Dictionary data abstraction.
  * Maps from strings to pointers.
  * Stores as a sorted list of key/value pairs.
 …
+}
 /* Returns 0 on success.  Will copy the key but make
    a reference to the value.  Will clobber an existing
+/* Returns 0 on success.  Will copy the key but make
+   a reference to the value.  Will clobber an existing
    entry with the same key iff delete_on_replace!=NULL,
    and will run delete_on_replace on the old element.
 …
     if (pos!=d->size) {
       /* shift forward to leave us a slot */
       memmove(d->els+pos+1, d->els+pos,
+      memmove(d->els+pos+1, d->els+pos,
               sizeof(owl_dict_el)*(d->size-pos));
+    }
     d->size++;
     d->els[pos].k = g_strdup(k);
     d->els[pos].v = v;
+    d->els[pos].v = v;
     return(0);
+  }

doc/advanced.txt

-                      rc82b055
+                      r7869e48
      type          message type ('zephyr', 'aim', 'admin')
      direction     either 'in' 'out' or 'none'\n"
      login         either 'login' 'logout' or 'none'\n"
+     login         either 'login' 'logout' or 'none'\n"
 You can also use the operators 'and' 'or' and 'not' as well as the
 …
 *** WARNING: This interface is still evolving and may change over time ***
 The ~/.owlconf file is interpreted by the perl interpreter.
+The ~/.owlconf file is interpreted by the perl interpreter.
 You may specify an alternate file by running owl with "owl -c <configfile>".
 …
     owl::format_msg()  run to format messages when using the perl style.
                        The return value is used to display the message on the
                        screen.
+                       screen.
     owl::receive_msg() run when a message is received, and after
                        it has been added to the message list
 …
      owl::command('set zsigproc "/mit/kretch/bin/getzsig foo"');
 will set the owl variable zsigproc to
+will set the owl variable zsigproc to
 the value "/mit/kretch/bin/getzsig foo".
 Note that you will need to watch out for perl quoting issues.
 …
 Both owl::format_msg and owl::receive_msg are passed perl owl::Message
 objects which have methods for accessing the attributes of the message.
+objects which have methods for accessing the attributes of the message.
 (Caveat: Note that these owl::Message objects are currently only
 …
+    }
 In the above, $m is the owl::Message object and
+In the above, $m is the owl::Message object and
 its methods are called with $m->METHODNAME.
 An example receiver function that tags all zephyr pings for
+An example receiver function that tags all zephyr pings for
 deletion would be:
 …
 If you use pperl instead of perl, the return value
 of the perl command will be displayed in a pop-up window.
 This is particularly useful within key bindings
+This is particularly useful within key bindings
 and aliases.  For example:
 …
 Will cause the "finger" command to be used to finger at the host
 where the current message came from.  You can then bind this
+where the current message came from.  You can then bind this
 to the "f" key with:

doc/barnowl.1

-                      r8135737
+                      r7869e48
 \fB\-c\fP, \fB\-\-config\-file\fP=\fIFILE\fP
 Specify an alternate config file for \fBBarnOwl\fP to use.  The config file is
 an arbitrary Perl script evaluated in the \fImain\fP package, and if it
 overrides the \fIBarnOwl::startup\fP method that is run when \fBBarnOwl\fP
 starts.  (Compare \fI~/.owl/startup\fP, which contains \fBBarnOwl\fP commands
+an arbitrary Perl script evaluated in the \fImain\fP package, and if it
+overrides the \fIBarnOwl::startup\fP method that is run when \fBBarnOwl\fP
+starts.  (Compare \fI~/.owl/startup\fP, which contains \fBBarnOwl\fP commands
 that are run at startup after the config file is loaded.)
 By default, \fBBarnOwl\fP uses the first of \fI~/.owl/init.pl\fP,
+By default, \fBBarnOwl\fP uses the first of \fI~/.owl/init.pl\fP,
 \fI~/.barnowlconf\fP, or \fI~/.owlconf\fP that exists.

doc/code.txt

-                      rd40ad8b
+                      r7869e48
              is owl_function_command("foo");
              Commands are only active within specific contexts,
              and attempts to call them from invalid contexts will fail.
+             and attempts to call them from invalid contexts will fail.
 context:     A context specifies the current state of owl, in terms
+context:     A context specifies the current state of owl, in terms
              of which modal window is active and which point
              in its life owl is in (eg, in startup, or running).
              This is implemented as a bitmask and there is
+             This is implemented as a bitmask and there is
              some hierarchy.  Commands may restrict themselves
              to only running in a limited number of contexts
 …
              Sometimes also referred to as typewin.
 filter:      Patterns which match messages.  These may
              contain multiple filterelements which may be
+filter:      Patterns which match messages.  These may
+             contain multiple filterelements which may be
              combined together (eg, by "and" and "or").
 filterelement: An element of a filter which matches on some
+filterelement: An element of a filter which matches on some
                attribute of a message.
 …
              These are particularly useful for building up
              text regions that are to be rendered on-screen,
              as they resize memory as needed, and they have
+             as they resize memory as needed, and they have
              routines for cropping as needed.
 …
              owl.h defines "g" as a singleton instance of owl_global.
              Where possible/appropriate, most accesses to global data should
              be from a limited number of files (eg, from owl.c and
+             be from a limited number of files (eg, from owl.c and
              functions.c).  Consider whether you really need to before
              adding in uses of global.
 …
              Also contains the main loop, which is roughly:
              - handle scheduled resizes, and anything that might result
              - while zephyrs are pending, grab incoming zephyrs
+             - while zephyrs are pending, grab incoming zephyrs
                and handle them (which includes formatting them
                with either perl extension or default formatter
 …
              - updates mainwin display if there are new zephyrs
              - displays and updates popwins and the terminal as necessary
              - sends characters to the popwin, recwin/mainwin,
+             - sends characters to the popwin, recwin/mainwin,
                or typewin/editwin
 …
                    Created by codelist.pl.
 popwin:      Modal pop-up window container.
+popwin:      Modal pop-up window container.
              Usually contains a viewwin for read-only scrolling text.
 …
 util:        Misc utility functions that don't fit anywhere yet:
              - sepbar rendering
+             - sepbar rendering
              - tokenizing and parsing utilities
              - downstr
 …
         something, and this should be the exception to the rule.
         Owl should be generally useful out-of-the-box without
         extensive configuration, for most people's needs.
+        Owl should be generally useful out-of-the-box without
+        extensive configuration, for most people's needs.
         People shouldn't have to spend days tweaking
         with config files before being happy switching to it.

doc/intro.txt

-                      rd7cc50b
+                      r7869e48
 variable.  For example:
      set personalbell on
+     set personalbell on
 will set the value of the variable 'personalbell' to 'on'.  The
 …
     owl::format_msg()  run to format messages when using the perl style.
                        The return value is used to display the message on the
                        screen.
+                       screen.
     owl::receive_msg() run when a message is received, and after
                        it has been added to the message list
 …
 For example:
    bindkey recv C-k command delete
 will bind Control-k to the delete command, but only in the
+   bindkey recv C-k command delete
+will bind Control-k to the delete command, but only in the
 recv window context.
 Some keymaps inherit their bindings from more
+Some keymaps inherit their bindings from more
 general keymaps.  The valid keymaps are:
 …
     |  |-editresponse - single-line responses to questions
     |-popless         - scrolling pop-up windows
     |-recv            - the main message list window
+    |-recv            - the main message list window
                         where received messages are displayed
 …
 Note that not all commands may be used in all contexts.
 Key sequences may be surrounded by quotes and include
+Key sequences may be surrounded by quotes and include
 a sequence of keys that must be pressed in order
 to execute the command.  For example:

editwin.c

-                      r7803326
+                      r7869e48
   const char *p;
   int width = offset;
   for(p = e->buff + start;
       p < e->buff + end;
 …
+{
   char *p;
   p = g_new(char, end - start + 1);
   memcpy(p, e->buff + start, end - start);
 …
   if (e->win) owl_window_dirty(e->win);
+}

examples/owlconf.erik

-                      rd7cc50b
+                      r7869e48
 ### The owlconf config file   -*- perl -*-
+### The owlconf config file   -*- perl -*-
 ###
 ### !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!!
 ### This is an example file intended to demonstrate how to use
+### This is an example file intended to demonstrate how to use
 ### various features of owl.  Some of the key bindings, in particular,
 ### are more for examples than things you may actually want to use.
 …
 ### The message attributes may be dereferenced with $m->attribute
 ###
 ###
+###
 # tokens for sepbar are:
 …
+}
 # Load in things which don't belong in an owlconf
+# Load in things which don't belong in an owlconf
 # that people might use as an example...
 sub personal_startup {
 …
             sepbartokens_add("<$sender");
             sepbartokens_trim(">$sender");
+        }
+        }
     } elsif ($m->is_mail) {
         mail_add_message($m);
 …
     my ($b) = @_;
     $b=~s/^/    /g;
     $b=~s/\n/\n    /g;
+    $b=~s/\n/\n    /g;
     return $b;
+}
 …
+    }
     if (!$m->is_zephyr && !$m->is_aim) {
+    if (!$m->is_zephyr && !$m->is_aim) {
         return "Unknown message type: ".$m->type."\n";
+    }
 …
     if ($m->is_zephyr) {
         $out = sprintf "[mit,%s,%s] / %s / %s", lc($m->class),
+        $out = sprintf "[mit,%s,%s] / %s / %s", lc($m->class),
         lc($m->instance), $m->time, lc($m->host);
         if ($m->opcode ne "") {$out.=" op:".$m->opcode;}
 …
+            }
+        }
         $out.="\n";
+        $out.="\n";
     } else {
         $out = sprintf "[%s] / %s\n", lc($m->type), $m->time;
         $out.= "  \@bold($sender)> ";
         $out.="\n";
+        $out.="\n";
+    }
 …
+    }
     if (!$m->is_zephyr && !$m->is_aim) {
+    if (!$m->is_zephyr && !$m->is_aim) {
         return "Unknown message type: ".$m->type."\n";
+    }
 …
+        }
         return "$out\n";
     } elsif ($m->is_zephyr && $m->is_mail) {
         my $body = $m->body;
 …
     my $channel = "";
     my $body = $m->body;
     if ($m->is_zephyr) {
         my $inst = $m->instance;
 …
+    }
     for my $w (@words) {
         if (($outline ne "")
+        if (($outline ne "")
             && (length($outline)+length($w) > $width-$unindent)) {
             $out .= $outline."\n";
 …
         $outline .= $w;
+    }
     $out .= $outline . "\n";
+}
+    $out .= $outline . "\n";
+}

examples/owlconf.simple

-                      rd7cc50b
+                      r7869e48
 ### The owlconf config file   -*- perl -*-
+### The owlconf config file   -*- perl -*-
 ### !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!! !!!!!WARNING!!!!!
 ### This is an example file intended to demonstrate how to use
+### This is an example file intended to demonstrate how to use
 ### various features of owl.  Some of the key bindings, in particular,
 ### are more for examples than things you may actually want to use.
 …
 ###     $owl::sender, $owl::opcode, $owl::zsig,
 ###     $owl::msg, $owl::time, $owl::host, @owl::fields, $owl::id
 ###
+###
 # NOTE: Lines beginning with a "#" are perl comments.
 …
     ## Doing "help" will show you more about each variable.
     ## These lines will set things to the default.
     ## You can uncomment them and then change the value to get
+    ## You can uncomment them and then change the value to get
     ## a different behavior (remove the "#" to an alternate value).
     ################################################################
 …
     ## Set this to on to enable logging of personal zephyrs
     # owl::command('set -q logging off');
+    # owl::command('set -q logging off');
     ## This directory must exist and is where personal zephyrs are logged.
 …
     ## Set this to on to enable logging of classes
     # owl::command('set -q classlogging off');
+    # owl::command('set -q classlogging off');
     ## This directory must exist and is where class zephyrs are logged.
 …
     ################################################################
     ## The following create filters.  Filters can be used to select
     ## on multiple zephyrs for operations.  With 'views' you can
+    ## on multiple zephyrs for operations.  With 'views' you can
     ## look at only the zephyrs matching a particular filter.
     ## Use the 'view <filtername>' command or the 'v' key to switch views.
 …
     ## The filter command creates a filter with the specified name,
     ## or if one already exists it is replaced.  Example filter
     ## syntax would be:
+    ## syntax would be:
     ##
     ##    filter myfilter -c red ( class ^foobar$ ) or ( class ^quux$ and instance ^bar$ )
 …
     ## is used it specifies the color that messages matching this filter
     ## should be displayed in.  Do 'show colors' to see the available colors.
     ##
+    ##
     ################################################################
 …
     ## The 'trash' filter is used when you press 'T' to mark things
     ## for autodeletion.
     # owl::command('filter trash class ^mail$ or opcode ^ping$ or type ^admin$ or class ^login$');
+    # owl::command('filter trash class ^mail$ or opcode ^ping$ or type ^admin$ or class ^login$');
+}
 …
     ## Note that:
     ##   $out .= "foo";  appends "foo" to the end of the variable $out.
     ##   lc(bar) will convert bar to lowercase.
+    ##   lc(bar) will convert bar to lowercase.
     ##   "ne" does "not equal" for string comparison.
     ##   sprintf fills in the %s's with the arguments later on the line.
 …
         # Incoming messages
         $out .= sprintf "[mit,%s,%s] / %s / %s", lc($owl::class),
+        $out .= sprintf "[mit,%s,%s] / %s / %s", lc($owl::class),
                         lc($owl::instance), $owl::time, lc($owl::host);
         if ($owl::opcode ne "") {$out.=" op:$owl::opcode";}
 …
+        }
+    }
     $out.="\n";
+    $out.="\n";
     # This indents the body of the message and then appends it on.
 …
 ## In most cases you won't need anything here.
 sub owl::receive_msg() {
     ## If this is uncommented, it would mark all messages
     ## with opcode "PING" for immediate deletion:

examples/owlconf.vtformat

-                      rd7cc50b
+                      r7869e48
 ### The owlconf config file   -*- perl -*-
+### The owlconf config file   -*- perl -*-
 ###
 ### This file is interpreted by the perl interpreter.
 …
 ###     $owl::sender, $owl::opcode, $owl::zsig,
 ###     $owl::msg, $owl::time, $owl::host, @owl::fields
 ###
+###
 # classes will be appreviated this way
 …
+    }
     for my $w (@words) {
         if (($outline ne "")
+        if (($outline ne "")
             && (length($outline)+length($w) > $width-$unindent)) {
             $out .= $outline."\n";
 …
         $outline .= $w;
+    }
     $out .= $outline . "\n";
+    $out .= $outline . "\n";
+}

filterelement.c

r7756dde	r7869e48
75	75	*/
76	76	return 0;
77		}
	77	}
78	78	return owl_filter_message_match(subfilter, m);
79	79	}

fmtext.c

-                      rf271129
+                      r7869e48
+{
   int a = 0, fg = 0, bg = 0;
   if (attr != OWL_FMTEXT_ATTR_NONE) a=1;
   if (fgcolor != OWL_COLOR_DEFAULT) fg=1;
 …
     p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+  }
+}
+}
 /* Internal function.  Append text from 'in' between index 'start'
 …
   char attr;
   short fg, bg, pair = 0;
   if (w==NULL) {
     owl_function_debugmsg("Hit a null window in owl_fmtext_curs_waddstr.");
 …
       /* Deal with all text from last insert to here. */
       char tmp;
       tmp = p[0];
       p[0] = '\0';
 …
           _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
           _owl_fmtext_wcolor_set(w, pair);
           waddnstr(w, s + start, end - start);
 …
   const char *ptr1, *ptr2;
   int i, offset;
   /* find the starting line */
   ptr1 = in->buff->str;
 …
     ptr1++;
+  }
   /* ptr1 now holds the starting point */
 …
       break;
+    }
     if (ptr_e == ptr_s) {
       owl_fmtext_append_normal(out, "\n");
 …
         chwidth = mk_wcwidth(c);
         if (col + chwidth > bcol) break;
         if (col >= acol) {
           if (st == 0) {
 …
         continue;
+      }
       /* if there's no opener, print the @ and continue */
       tmpptr=strpbrk(txtptr, "(<[{ ");
 …
         /* if it's a color read the color, set the current color and
            continue */
       } else if (!strcasecmp(buff, "@color")
+      } else if (!strcasecmp(buff, "@color")
                  && owl_global_is_colorztext(&g)) {
         g_free(buff);
 …
 /* requires that the list values are strings or NULL.
  * joins the elements together with join_with.
+ * joins the elements together with join_with.
  * If format_fn is specified, passes it the list element value
  * and it will return a string which this needs to free. */
 …
   if (fg > COLORS || fg < OWL_COLOR_DEFAULT) fg = OWL_COLOR_DEFAULT;
   if (bg > COLORS || bg < OWL_COLOR_DEFAULT) bg = OWL_COLOR_DEFAULT;
 #ifdef HAVE_USE_DEFAULT_COLORS
   if (fg == OWL_COLOR_DEFAULT) fg = -1;

functions.c

-                      r06470d7
+                      r7869e48
+{
   owl_function_debugmsg("executing command: %s", cmdbuff);
   return owl_cmddict_execute(owl_global_get_cmddict(&g),
+  return owl_cmddict_execute(owl_global_get_cmddict(&g),
                              owl_global_get_context(&g), cmdbuff);
+}
 …
   m=g_new(owl_message, 1);
   owl_message_create_admin(m, header, body);
   /* add it to the global list and current view */
   owl_messagelist_append_element(owl_global_get_msglist(&g), m);
 …
   /* error if we're not logged into aim */
   if (!owl_global_is_aimloggedin(&g)) return(NULL);
   m=g_new(owl_message, 1);
   owl_message_create_aim(m,
 …
   if (unwrap)
     owl_text_wordunwrap(format_msg);
   /* send the message */
   ret=owl_aim_send_im(to, format_msg);
 …
   format_msg=g_strdup(msg);
   owl_text_wordunwrap(format_msg);
   /* send the message */
   ret=owl_aim_send_awaymsg(to, format_msg);
 …
 /* If filter is non-null, looks for the next message matching
  * that filter.  If skip_deleted, skips any deleted messages.
+ * that filter.  If skip_deleted, skips any deleted messages.
  * If last_if_none, will stop at the last message in the view
  * if no matching messages are found.  */
 …
   if (move_after) {
     /* move the poiner in the appropriate direction
+    /* move the poiner in the appropriate direction
      * to the next undeleted msg */
     if (owl_global_get_direction(&g)==OWL_DIRECTION_UPWARDS) {
 …
   v=owl_global_get_current_view(&g);
   if (owl_view_get_size(v) < 1) {
     owl_function_error("No current message to undelete");
 …
   owl_function_redisplay_to_nearest(lastmsgid, v);
   owl_function_makemsg("Messages expunged");
+}
 …
   v=owl_global_get_current_view(&g);
   oldcurmsg=owl_global_get_curmsg(&g);
   curmsg=owl_view_get_size(v)-1;
+  curmsg=owl_view_get_size(v)-1;
   if (curmsg<0) curmsg=0;
   owl_global_set_curmsg(&g, curmsg);
 …
     owl_global_set_topmsg(&g, curmsg+1);
     owl_global_set_curmsg(&g, curmsg+1);
+  }
+  }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_global_set_direction_downwards(&g);
 …
+{
   char *ret;
   /* zlog out if we need to */
   if (owl_global_is_havezephyr(&g) &&
 …
     kill(owl_global_get_newmsgproc_pid(&g), SIGHUP);
+  }
   /* Quit AIM */
   if (owl_global_is_aimloggedin(&g)) {
 …
+}
 /* Returns what the new topmsg should be.
  * Passed the last direction of movement,
+/* Returns what the new topmsg should be.
+ * Passed the last direction of movement,
  * the current view,
  * the current message number in the view,
 …
 int owl_function_calculate_topmsg_neartop(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
+{
   if (curmsg>0
+  if (curmsg>0
       && (owl_message_get_numlines(owl_view_get_element(v, curmsg-1))
           <  recwinlines/2)) {
 …
+  }
+}
 int owl_function_calculate_topmsg_center(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
+{
 …
   return(last);
+}
 int owl_function_calculate_topmsg_paged(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
+{
   int i, last, lines, savey;
   /* If we're off the top of the screen, scroll up such that the
+  /* If we're off the top of the screen, scroll up such that the
    * curmsg is near the botton of the screen. */
   if (curmsg < topmsg) {
 …
   if (curmsg<0) return(topmsg);
   /* If we're off the top of the screen then center */
   if (curmsg<topmsg) {
 …
     direction=OWL_DIRECTION_UPWARDS;
+  }
   /* If our bottom line is less than 1/4 down the screen then scroll up */
   if (direction == OWL_DIRECTION_UPWARDS || direction == OWL_DIRECTION_NONE) {
 …
   owl_fmtext_init_null(&fm);
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
 …
   if (owl_message_is_type_zephyr(m)) {
     owl_fmtext_append_bold(&fm, "\nZephyr Specific Information:\n");
     owl_fmtext_appendf_normal(&fm, "  Class     : %s\n", owl_message_get_class(m));
     owl_fmtext_appendf_normal(&fm, "  Instance  : %s\n", owl_message_get_instance(m));
 …
   owl_message_attributes_tofmtext(m, &attrfm);
   owl_fmtext_append_fmtext(&fm, &attrfm);
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 …
       return;
+    }
     /* Bail if we're not truncated */
     if (!owl_mainwin_is_curmsg_truncated(owl_global_get_mainwin(&g))) {
 …
+    }
+  }
   /* don't scroll past the last line */
   if (step>0) {
 …
+    }
+  }
   /* redisplay */
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 …
     owl_function_popless_text("Error getting subscriptions");
+  }
   g_free(buff);
+}
 …
   const owl_variable *v;
   GPtrArray *varnames;
   owl_fmtext fm;
+  owl_fmtext fm;
   int i;
   const char *varname;
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_bold(&fm,
+  owl_fmtext_append_bold(&fm,
       "Variables: (use 'show variable <name>' for details)\n");
   varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));
 …
+{
   const owl_variable *v;
   owl_fmtext fm;
+  owl_fmtext fm;
   owl_fmtext_init_null(&fm);
 …
   owl_fmtext_append_normal(&fm, "no\n");
 #endif
   owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
 …
   const owl_message *m;
   const owl_filter *f;
   if (owl_view_get_size(owl_global_get_current_view(&g))==0) {
     owl_function_error("No message selected");
   } else {
     char *cmd;
     m=owl_view_get_element(owl_global_get_current_view(&g), owl_global_get_curmsg(&g));
     if (!m) {
 …
 #if OWL_STDERR_REDIR
   redirect = " < /dev/null";
 #endif
+#endif
   if (argc<2) {
 …
     out = owl_slurp(p);
     pclose(p);
     if (type == OWL_OUTPUT_RETURN) {
       g_free(newbuff);
 …
   perlout = owl_perlconfig_execute(buff);
   if (perlout) {
+  if (perlout) {
     if (type == OWL_OUTPUT_POPUP) {
       owl_function_popless_text(perlout);
 …
   /* Figure out what to set the current message to.
    * - If the view we're leaving has messages in it, go to the closest message
    *   to the last message pointed to in that view.
+   *   to the last message pointed to in that view.
    * - If the view we're leaving is empty, try to restore the position
    *   from the last time we were in the new view.  */
 …
   owl_function_debugmsg("owl_function_create_negative_filter");
   if (!strncmp(filtername, "not-", 4)) {
     newname=g_strdup(filtername+4);
 …
  * If 'related' is nonzero, encompass unclasses and .d classes as well.
  */
 CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related)
+CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related)
+{
   owl_filter *f;
 …
+    }
+  }
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
 …
   owl_function_makemsg("%i messages marked for %sdeletion", j, flag?"":"un");
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+}
 …
  * If the curmsg is a zephyr class message, instance foo, recip *,
  *    return a filter name to the class, inst.
  * If the curmsg is a zephyr class message and type==0 then
+ * If the curmsg is a zephyr class message and type==0 then
  *    return a filter name for just the class.
  * If the curmsg is a zephyr class message and type==1 then
+ * If the curmsg is a zephyr class message and type==1 then
  *    return a filter name for the class and instance.
  * If the curmsg is a personal AIM message returna  filter
  *    name to the AIM conversation with that user
+ *    name to the AIM conversation with that user
  */
 CALLER_OWN char *owl_function_smartfilter(int type, int invert_related)
 …
 void owl_function_smartzpunt(int type)
+{
   /* Starts a zpunt command based on the current class,instance pair.
+  /* Starts a zpunt command based on the current class,instance pair.
    * If type=0, uses just class.  If type=1, uses instance as well. */
   const owl_view *v;
 …
   const char *mclass, *minst;
   GString *buf;
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
 …
+  }
   owl_filter_set_fgcolor(f, owl_util_string_to_color(fgcolor));
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   return(0);
 …
+{
   owl_fmtext fm;
   int i;
+  int i;
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_normal(&fm,"default:  ");
 …
      g_free(str2);
+  }
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 …
+  }
   owl_fmtext_append_normal(&fm, "\n");
   owl_function_popless_fmtext(&fm);
   owl_ptr_array_free(l, g_free);
 …
 CALLER_OWN char *owl_function_keymap_summary(const char *name)
+{
   const owl_keymap *km
+  const owl_keymap *km
     = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) return owl_keymap_summary(km);
 …
   } else {
     owl_fmtext_append_normal(&fm, "No such keymap...\n");
+  }
+  }
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 …
   owl_fmtext_init_null(&fm);
   owl_cmd_get_help(owl_global_get_cmddict(&g), cmdname, &fm);
   owl_function_popless_fmtext(&fm);
+  owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
+}
 …
   viewsize=owl_view_get_size(v);
   curmsg=owl_global_get_curmsg(&g);
   if (viewsize==0) {
     owl_function_makemsg("No messages present");
 …
+}
 /* strips formatting from ztext and returns the unformatted text.
+/* strips formatting from ztext and returns the unformatted text.
  * caller is responsible for freeing. */
 CALLER_OWN char *owl_function_ztext_stylestrip(const char *zt)
 …
 /* Dump messages in the current view to the file 'filename'. */
 void owl_function_dump(const char *filename)
+void owl_function_dump(const char *filename)
+{
   int i, j;
 …
+      }
+    }
     /* if it exited, spawn a new one */
     if (owl_global_get_newmsgproc_pid(&g)==0) {

global.c

-                      r0792d99
+                      r7869e48
   g->lastinputtime=g->starttime;
   g->newmsgproc_pid=0;
   owl_global_set_config_format(g, 0);
   owl_global_set_no_have_config(g);
 …
 int owl_global_should_followlast(owl_global *g) {
   const owl_view *v;
   if (!owl_global_is__followlast(g)) return(0);
   v=owl_global_get_current_view(g);
   if (owl_global_get_curmsg(g)==owl_view_get_size(v)-1) return(1);
   return(0);
 …
   return(&(g->buddylist));
+}
 /* style */

help.c

-                      rd6b8b50
+                      r7869e48
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_bold
     (&fm,
+    (&fm,
      "OWL HELP\n\n");
   owl_fmtext_append_normal
     (&fm,
+    (&fm,
      "  If you're new to BarnOwl, the first thing you should type is\n\n"
      "    :show quickstart\n\n"
 …
   owl_fmtext_append_bold
     (&fm,
+    (&fm,
      "  Basic Keys:\n"
      );
   owl_fmtext_append_normal
     (&fm,
+    (&fm,
      "    n             Move to next non-deleted message\n"
      "    p             Move to previous non-deleted message\n"
 …
      );
   owl_fmtext_append_bold
     (&fm,
+    (&fm,
      "  Basic Commands:\n"
      );
   owl_fmtext_append_normal
     (&fm,
+    (&fm,
      "    quit, exit    Exit BarnOwl\n"
      "    help          Get help about commands\n"
 …
      "    version       Print the version number of BarnOwl\n"
      "\n");
   /* help for variables */
   owl_fmtext_append_bold(&fm,
+  owl_fmtext_append_bold(&fm,
                          "Variables:\n");
   varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));

keybinding.c

-                      rf271129
+                      r7869e48
 /*
  * TODO: Idea for allowing functions to be user-specified ---
  *      Have function have a context bitmask that says where it
+ * TODO: Idea for allowing functions to be user-specified ---
+ *      Have function have a context bitmask that says where it
  *      can be used, and have keymaps also have one, and compare
  *      the two when setting.
+ *
+ *
  */

keymap.c

-                      rf271129
+                      r7869e48
     return -1;
   /* see if another matching binding, and if so remove it.
    * otherwise just add this one.
+   * otherwise just add this one.
    */
   for (i = km->bindings->len-1; i >= 0; i--) {
 …
     owl_fmtext_append_normal(fm, "\n");
   if (km->default_fn) {
     owl_fmtext_append_normal(fm, OWL_TABSTR
+    owl_fmtext_append_normal(fm, OWL_TABSTR
      "Has a default keypress handler (default_fn).\n");
+  }
 …
+  }
   if (km->postalways_fn) {
     owl_fmtext_append_normal(fm, OWL_TABSTR
+    owl_fmtext_append_normal(fm, OWL_TABSTR
      "Executes a function (postalways_fn) after handling every keypress.\n");
+  }
   owl_fmtext_append_bold(fm, "\nKey bindings:\n\n");
+  owl_fmtext_append_bold(fm, "\nKey bindings:\n\n");
   if (recurse) {
     _owl_keymap_format_with_parents(km, fm);
 …
   int i;
   const owl_keybinding *kb;
   for (i = 0; i < km->bindings->len; i++) {
     char *kbstr;
 …
       owl_fmtext_append_normal(fm, kb->command);
       owl_fmtext_append_normal(fm, "]");
+    }
+    }
     owl_fmtext_append_normal(fm, "\n");
+  }
 …
     kh->in_esc = 0;
+  }
   kh->kpstack[++(kh->kpstackpos)] = j.ch;
   if (kh->kpstackpos >= OWL_KEYMAP_MAXSTACK) {
 …
   owl_keyhandler_invalidkey(kh);
   /* unable to handle */
   return(1);
+  return(1);
+}

keypress.c

-                      rf271129
+                      r7869e48
 } specialmap[] = {
 #ifdef KEY_CODE_YES
    { KEY_CODE_YES,      "CODE_YES" },
+   { KEY_CODE_YES,      "CODE_YES" },
 #endif
    { KEY_MIN,           "MIN" },
    { KEY_BREAK,         "BREAK" },
    { KEY_DOWN,          "DOWN" },
    { KEY_UP,            "UP" },
    { KEY_LEFT,          "LEFT" },
    { KEY_RIGHT,         "RIGHT" },
    { KEY_HOME,          "HOME" },
    { KEY_BACKSPACE,     "BACKSPACE" },
    { KEY_F0,            "F0" },
    { KEY_F(1),          "F1" },
    { KEY_F(2),          "F2" },
    { KEY_F(3),          "F3" },
    { KEY_F(4),          "F4" },
    { KEY_F(5),          "F5" },
    { KEY_F(6),          "F6" },
    { KEY_F(7),          "F7" },
    { KEY_F(8),          "F8" },
    { KEY_F(9),          "F9" },
    { KEY_F(10),         "F10" },
    { KEY_F(11),         "F11" },
    { KEY_F(12),         "F12" },
    { KEY_DL,            "DL" },
    { KEY_IL,            "IL" },
    { KEY_DC,            "DC" },
    { KEY_IC,            "IC" },
    { KEY_EIC,           "EIC" },
    { KEY_CLEAR,         "CLEAR" },
    { KEY_EOS,           "EOS" },
    { KEY_EOL,           "EOL" },
    { KEY_SF,            "SF" },
    { KEY_SR,            "SR" },
    { KEY_NPAGE,         "NPAGE" },
    { KEY_PPAGE,         "PPAGE" },
    { KEY_STAB,          "STAB" },
    { KEY_CTAB,          "CTAB" },
    { KEY_CATAB,         "CATAB" },
    { KEY_ENTER,         "ENTER" },
    { KEY_SRESET,        "SRESET" },
    { KEY_RESET,         "RESET" },
    { KEY_PRINT,         "PRINT" },
    { KEY_LL,            "LL" },
    { KEY_A1,            "A1" },
    { KEY_A3,            "A3" },
    { KEY_B2,            "B2" },
    { KEY_C1,            "C1" },
    { KEY_C3,            "C3" },
    { KEY_BTAB,          "BTAB" },
    { KEY_BEG,           "BEG" },
    { KEY_CANCEL,        "CANCEL" },
    { KEY_CLOSE,         "CLOSE" },
    { KEY_COMMAND,       "COMMAND" },
    { KEY_COPY,          "COPY" },
    { KEY_CREATE,        "CREATE" },
    { KEY_END,           "END" },
    { KEY_EXIT,          "EXIT" },
    { KEY_FIND,          "FIND" },
    { KEY_HELP,          "HELP" },
    { KEY_MARK,          "MARK" },
    { KEY_MESSAGE,       "MESSAGE" },
    { KEY_MOVE,          "MOVE" },
    { KEY_NEXT,          "NEXT" },
    { KEY_OPEN,          "OPEN" },
    { KEY_OPTIONS,       "OPTIONS" },
    { KEY_PREVIOUS,      "PREVIOUS" },
    { KEY_REDO,          "REDO" },
    { KEY_REFERENCE,     "REFERENCE" },
    { KEY_REFRESH,       "REFRESH" },
    { KEY_REPLACE,       "REPLACE" },
    { KEY_RESTART,       "RESTART" },
    { KEY_RESUME,        "RESUME" },
    { KEY_SAVE,          "SAVE" },
    { KEY_SBEG,          "SBEG" },
    { KEY_SCANCEL,       "SCANCEL" },
    { KEY_SCOMMAND,      "SCOMMAND" },
    { KEY_SCOPY,         "SCOPY" },
    { KEY_SCREATE,       "SCREATE" },
    { KEY_SDC,           "SDC" },
    { KEY_SDL,           "SDL" },
    { KEY_SELECT,        "SELECT" },
    { KEY_SEND,          "SEND" },
    { KEY_SEOL,          "SEOL" },
    { KEY_SEXIT,         "SEXIT" },
    { KEY_SFIND,         "SFIND" },
    { KEY_SHELP,         "SHELP" },
    { KEY_SHOME,         "SHOME" },
    { KEY_SIC,           "SIC" },
    { KEY_SLEFT,         "SLEFT" },
    { KEY_SMESSAGE,      "SMESSAGE" },
    { KEY_SMOVE,         "SMOVE" },
    { KEY_SNEXT,         "SNEXT" },
    { KEY_SOPTIONS,      "SOPTIONS" },
    { KEY_SPREVIOUS,     "SPREVIOUS" },
    { KEY_SPRINT,        "SPRINT" },
    { KEY_SREDO,         "SREDO" },
    { KEY_SREPLACE,      "SREPLACE" },
    { KEY_SRIGHT,        "SRIGHT" },
    { KEY_SRSUME,        "SRSUME" },
    { KEY_SSAVE,         "SSAVE" },
    { KEY_SSUSPEND,      "SSUSPEND" },
    { KEY_SUNDO,         "SUNDO" },
    { KEY_SUSPEND,       "SUSPEND" },
    { KEY_UNDO,          "UNDO" },
    { KEY_MOUSE,         "MOUSE" },
+   { KEY_MIN,           "MIN" },
+   { KEY_BREAK,         "BREAK" },
+   { KEY_DOWN,          "DOWN" },
+   { KEY_UP,            "UP" },
+   { KEY_LEFT,          "LEFT" },
+   { KEY_RIGHT,         "RIGHT" },
+   { KEY_HOME,          "HOME" },
+   { KEY_BACKSPACE,     "BACKSPACE" },
+   { KEY_F0,            "F0" },
+   { KEY_F(1),          "F1" },
+   { KEY_F(2),          "F2" },
+   { KEY_F(3),          "F3" },
+   { KEY_F(4),          "F4" },
+   { KEY_F(5),          "F5" },
+   { KEY_F(6),          "F6" },
+   { KEY_F(7),          "F7" },
+   { KEY_F(8),          "F8" },
+   { KEY_F(9),          "F9" },
+   { KEY_F(10),         "F10" },
+   { KEY_F(11),         "F11" },
+   { KEY_F(12),         "F12" },
+   { KEY_DL,            "DL" },
+   { KEY_IL,            "IL" },
+   { KEY_DC,            "DC" },
+   { KEY_IC,            "IC" },
+   { KEY_EIC,           "EIC" },
+   { KEY_CLEAR,         "CLEAR" },
+   { KEY_EOS,           "EOS" },
+   { KEY_EOL,           "EOL" },
+   { KEY_SF,            "SF" },
+   { KEY_SR,            "SR" },
+   { KEY_NPAGE,         "NPAGE" },
+   { KEY_PPAGE,         "PPAGE" },
+   { KEY_STAB,          "STAB" },
+   { KEY_CTAB,          "CTAB" },
+   { KEY_CATAB,         "CATAB" },
+   { KEY_ENTER,         "ENTER" },
+   { KEY_SRESET,        "SRESET" },
+   { KEY_RESET,         "RESET" },
+   { KEY_PRINT,         "PRINT" },
+   { KEY_LL,            "LL" },
+   { KEY_A1,            "A1" },
+   { KEY_A3,            "A3" },
+   { KEY_B2,            "B2" },
+   { KEY_C1,            "C1" },
+   { KEY_C3,            "C3" },
+   { KEY_BTAB,          "BTAB" },
+   { KEY_BEG,           "BEG" },
+   { KEY_CANCEL,        "CANCEL" },
+   { KEY_CLOSE,         "CLOSE" },
+   { KEY_COMMAND,       "COMMAND" },
+   { KEY_COPY,          "COPY" },
+   { KEY_CREATE,        "CREATE" },
+   { KEY_END,           "END" },
+   { KEY_EXIT,          "EXIT" },
+   { KEY_FIND,          "FIND" },
+   { KEY_HELP,          "HELP" },
+   { KEY_MARK,          "MARK" },
+   { KEY_MESSAGE,       "MESSAGE" },
+   { KEY_MOVE,          "MOVE" },
+   { KEY_NEXT,          "NEXT" },
+   { KEY_OPEN,          "OPEN" },
+   { KEY_OPTIONS,       "OPTIONS" },
+   { KEY_PREVIOUS,      "PREVIOUS" },
+   { KEY_REDO,          "REDO" },
+   { KEY_REFERENCE,     "REFERENCE" },
+   { KEY_REFRESH,       "REFRESH" },
+   { KEY_REPLACE,       "REPLACE" },
+   { KEY_RESTART,       "RESTART" },
+   { KEY_RESUME,        "RESUME" },
+   { KEY_SAVE,          "SAVE" },
+   { KEY_SBEG,          "SBEG" },
+   { KEY_SCANCEL,       "SCANCEL" },
+   { KEY_SCOMMAND,      "SCOMMAND" },
+   { KEY_SCOPY,         "SCOPY" },
+   { KEY_SCREATE,       "SCREATE" },
+   { KEY_SDC,           "SDC" },
+   { KEY_SDL,           "SDL" },
+   { KEY_SELECT,        "SELECT" },
+   { KEY_SEND,          "SEND" },
+   { KEY_SEOL,          "SEOL" },
+   { KEY_SEXIT,         "SEXIT" },
+   { KEY_SFIND,         "SFIND" },
+   { KEY_SHELP,         "SHELP" },
+   { KEY_SHOME,         "SHOME" },
+   { KEY_SIC,           "SIC" },
+   { KEY_SLEFT,         "SLEFT" },
+   { KEY_SMESSAGE,      "SMESSAGE" },
+   { KEY_SMOVE,         "SMOVE" },
+   { KEY_SNEXT,         "SNEXT" },
+   { KEY_SOPTIONS,      "SOPTIONS" },
+   { KEY_SPREVIOUS,     "SPREVIOUS" },
+   { KEY_SPRINT,        "SPRINT" },
+   { KEY_SREDO,         "SREDO" },
+   { KEY_SREPLACE,      "SREPLACE" },
+   { KEY_SRIGHT,        "SRIGHT" },
+   { KEY_SRSUME,        "SRSUME" },
+   { KEY_SSAVE,         "SSAVE" },
+   { KEY_SSUSPEND,      "SSUSPEND" },
+   { KEY_SUNDO,         "SUNDO" },
+   { KEY_SUSPEND,       "SUSPEND" },
+   { KEY_UNDO,          "UNDO" },
+   { KEY_MOUSE,         "MOUSE" },
 #ifdef KEY_RESIZE
    { KEY_RESIZE,        "RESIZE" },
+   { KEY_RESIZE,        "RESIZE" },
 #endif
    { KEY_MAX,           "MAX" },
    { ' ',               "SPACE" },
    { 27,                "ESCAPE" },
    { 127,               "DELETE" },
    { '\r',              "CR" },
+   { KEY_MAX,           "MAX" },
+   { ' ',               "SPACE" },
+   { 27,                "ESCAPE" },
+   { 127,               "DELETE" },
+   { '\r',              "CR" },
    { '\n',              "LF" },
    { '\t',              "TAB" },
+   { '\t',              "TAB" },
    { 0,                 NULL }
 };
 …
       g_string_append_c(kb, j);
+    }
+  }
+  }
   if (!kb->str[0]) {
     /* not a valid key */

keys.c

-                      rdcd48ad
+                      r7869e48
     *km_ew_multi, *km_ew_onel, *km_viewwin;
   /****************************************************************/
   /*************************** GLOBAL *****************************/
 …
   km_global = km = owl_keyhandler_create_and_add_keymap(kh, "global",
        "System-wide default key bindings",
+       "System-wide default key bindings",
        owl_keys_default_invalid, NULL, NULL);
   BIND_CMD("C-z",      "message Use :suspend to suspend.", "");
 …
   km_editwin = km = owl_keyhandler_create_and_add_keymap(kh, "edit",
        "Text editing and command window",
+       "Text editing and command window",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_editwin, km_global);
 …
   km_ew_multi = km = owl_keyhandler_create_and_add_keymap(kh, "editmulti",
        "Multi-line text editing",
+       "Multi-line text editing",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_ew_multi, km_editwin);
 …
   BIND_CMD("M-n",         "edit:history-next", "");
   /* note that changing "disable-ctrl-d" to "on" will change this to
+  /* note that changing "disable-ctrl-d" to "on" will change this to
    * edit:delete-next-char */
   BIND_CMD("C-d",     "edit:done-or-delete", "sends the zephyr if at the end of the message");
 …
   km_ew_onel = km = owl_keyhandler_create_and_add_keymap(kh, "editline",
        "Single-line text editing",
+       "Single-line text editing",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_ew_onel, km_editwin);
 …
   BIND_CMD("CR",          "editline:done", "executes the command");
   /****************************************************************/
   /**************************** EDITRESPONSE **********************/
 …
   km_ew_onel = km = owl_keyhandler_create_and_add_keymap(kh, "editresponse",
        "Single-line response to question",
+       "Single-line response to question",
        owl_keys_editwin_default, NULL, owl_keys_editwin_postalways);
   owl_keymap_set_parent(km_ew_onel, km_editwin);
 …
   km_viewwin = km = owl_keyhandler_create_and_add_keymap(kh, "popless",
        "Pop-up window (eg, help)",
+       "Pop-up window (eg, help)",
        owl_keys_default_invalid, NULL, owl_keys_popless_postalways);
   owl_keymap_set_parent(km_viewwin, km_global);
 …
   BIND_CMD("M-M", "smartnarrow -ri",  "like M-N but with 'narrow-related' temporarily flipped.");
   BIND_CMD("M-p", "view personal", "");
   BIND_CMD("/",   "start-command search ", "start a search command");
   BIND_CMD("?",   "start-command search -r ", "start a reverse search command");
 …
   BIND_CMD("C-n",    "recv:next",      "");
   BIND_CMD("M-[ B",  "recv:next",      "");
   BIND_CMD("M-C-n",  "recv:next --smart-filter", "move to next message matching the current one");
+  BIND_CMD("M-C-n",  "recv:next --smart-filter", "move to next message matching the current one");
   BIND_CMD("UP",     "recv:prev",      "");
   BIND_CMD("M-[ A",  "recv:prev",      "");

libfaim/admin.c

-                      rcf02dd6
+                      r7869e48
  * Family 0x0007 - Account Administration.
+ *
  * Used for stuff like changing the formating of your screen name, changing your
  * email address, requesting an account confirmation email, getting account info,
+ * Used for stuff like changing the formating of your screen name, changing your
+ * email address, requesting an account confirmation email, getting account info,
+ *
  */
 …
  * 0x0013 - Unknown
+ *
  */
+ */
 faim_export int aim_admin_getinfo(aim_session_t *sess, aim_conn_t *conn, fu16_t info)
+{
 …
  * Subtypes 0x0003 and 0x0005 - Parse account info.
+ *
  * Called in reply to both an information request (subtype 0x0002) and
+ * Called in reply to both an information request (subtype 0x0002) and
  * an information change (subtype 0x0004).
+ *
 …
         aim_tlvlist_add_raw(&tl, 0x0001, strlen(newnick), newnick);
         aim_tlvlist_write(&fr->data, &tl);
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);
 …
         aim_tlvlist_add_raw(&tl, 0x0011, strlen(newemail), newemail);
         aim_tlvlist_write(&fr->data, &tl);
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);

libfaim/aim.h

-                      rfe73d0c
+                      r7869e48
 /*
+/*
  * Main libfaim header.  Must be included in client for prototypes/macros.
+ *
 …
 #if defined(mach) && defined(__APPLE__)
 #define gethostbyname(x) gethostbyname2(x, AF_INET)
+#define gethostbyname(x) gethostbyname2(x, AF_INET)
 #endif
 …
 /*
  * For a win32 DLL, we define WIN32_INDLL if this file
  * is included while compiling the DLL. If its not
+ * is included while compiling the DLL. If its not
  * defined (its included in a client app), the symbols
  * will be imported instead of exported.
 …
 #ifdef WIN32_INDLL
 #define faim_export __declspec(dllexport)
 #else
+#else
 #define faim_export __declspec(dllimport)
 #endif /* WIN32_INDLL */
 …
 #endif
 /*
  * Current Maximum Length for Screen Names (not including NULL)
+/*
+ * Current Maximum Length for Screen Names (not including NULL)
+ *
  * Currently only names up to 16 characters can be registered
 …
+ *
  * XXX: the real limit is the total SNAC size at 8192. Fix this.
+ *
+ *
  */
 #define MAXMSGLEN 7987
 …
+ *
  * This is actually defined by the protocol to be
  * dynamic, but I have yet to see due cause to
+ * dynamic, but I have yet to see due cause to
  * define it dynamically here.  Maybe later.
+ *
 …
 /*
  * Client info.  Filled in by the client and passed in to
+ * Client info.  Filled in by the client and passed in to
  * aim_send_login().  The information ends up getting passed to OSCAR
  * through the initial login command.
 …
 #define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQ_5_45_3777
 /*
  * These could be arbitrary, but its easier to use the actual AIM values
+/*
+ * These could be arbitrary, but its easier to use the actual AIM values
  */
 #define AIM_CONN_TYPE_BOS               0x0002
 …
         void *internal; /* internal conn-specific libfaim data */
         time_t lastactivity; /* time of last transmit */
         int forcedlatency;
+        int forcedlatency;
         void *handlerlist;
         void *sessv; /* pointer to parent session */
 …
         fu8_t hdrtype; /* defines which piece of the union to use */
         union {
                 struct {
+                struct {
                         fu8_t type;
                         flap_seqnum_t seqnum;
+                        flap_seqnum_t seqnum;
                 } flap;
                 struct {
 …
 /*
  * AIM Session: The main client-data interface.
+ * AIM Session: The main client-data interface.
+ *
  */
 …
         /*
          * Pointer to anything the client wants to
+         * Pointer to anything the client wants to
          * explicitly associate with this session.
+         *
 …
          * I/O.  I don't suggest that you use libfaim's internal I/O.
          * Its really bad and the API/event model is quirky at best.
+         *
+         *
          */
         aim_frame_t *queue_outgoing;
         aim_frame_t *queue_incoming;
+        aim_frame_t *queue_outgoing;
+        aim_frame_t *queue_incoming;
         /*
 …
         /*
          * Outstanding snac handling
+         * Outstanding snac handling
+         *
          * XXX: Should these be per-connection? -mid
 …
 /*
  * This information is provided in the Incoming ICBM callback for
  * Channel 1 ICBM's.
+ * Channel 1 ICBM's.
+ *
  * Note that although CUSTOMFEATURES and CUSTOMCHARSET say they
 …
         aim_mpmsg_t mpmsg;
         fu32_t icbmflags; /* some flags apply only to ->msg, not all mpmsg */
         /* Only provided if message has a human-readable section */
         char *msg;

libfaim/aim_cbtypes.h

-                      rcf02dd6
+                      r7869e48
 /*
  * SNAC Family: Ack.
+ *
+ *
  * Not really a family, but treating it as one really
  * helps it fit into the libfaim callback structure better.
 …
 /*
  * SNAC Family: General.
  */
+ */
 #define AIM_CB_GEN_ERROR 0x0001
 #define AIM_CB_GEN_CLIENTREADY 0x0002
 …
 /*
  * SNAC Family: Location Services.
  */
+ */
 #define AIM_CB_LOC_ERROR 0x0001
 #define AIM_CB_LOC_REQRIGHTS 0x0002
 …
 /*
  * SNAC Family: Buddy List Management Services.
  */
+ */
 #define AIM_CB_BUD_ERROR 0x0001
 #define AIM_CB_BUD_REQRIGHTS 0x0002
 …
 /*
  * SNAC Family: Messeging Services.
  */
+ */
 #define AIM_CB_MSG_ERROR 0x0001
 #define AIM_CB_MSG_PARAMINFO 0x0005
 …
 /*
  * SNAC Family: Advertisement Services
  */
+ */
 #define AIM_CB_ADS_ERROR 0x0001
 #define AIM_CB_ADS_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Invitation Services.
  */
+ */
 #define AIM_CB_INV_ERROR 0x0001
 #define AIM_CB_INV_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Administrative Services.
  */
+ */
 #define AIM_CB_ADM_ERROR 0x0001
 #define AIM_CB_ADM_INFOCHANGE_REPLY 0x0005
 …
 /*
  * SNAC Family: Popup Messages
  */
+ */
 #define AIM_CB_POP_ERROR 0x0001
 #define AIM_CB_POP_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Misc BOS Services.
  */
+ */
 #define AIM_CB_BOS_ERROR 0x0001
 #define AIM_CB_BOS_RIGHTSQUERY 0x0002
 …
 /*
  * SNAC Family: User Lookup Services
  */
+ */
 #define AIM_CB_LOK_ERROR 0x0001
 #define AIM_CB_LOK_DEFAULT 0xffff
 …
 /*
  * SNAC Family: User Status Services
  */
+ */
 #define AIM_CB_STS_ERROR 0x0001
 #define AIM_CB_STS_SETREPORTINTERVAL 0x0002
 …
 /*
  * SNAC Family: Translation Services
  */
+ */
 #define AIM_CB_TRN_ERROR 0x0001
 #define AIM_CB_TRN_DEFAULT 0xffff
 …
 /*
  * SNAC Family: Chat Navigation Services
  */
+ */
 #define AIM_CB_CTN_ERROR 0x0001
 #define AIM_CB_CTN_CREATE 0x0008
 …
 /*
  * SNAC Family: Chat Services
  */
+ */
 #define AIM_CB_CHT_ERROR 0x0001
 #define AIM_CB_CHT_ROOMINFOUPDATE 0x0002
 …
 /*
  * SNAC Family: "New" Search
  */
+ */
 #define AIM_CB_SCH_ERROR 0x0001
 #define AIM_CB_SCH_SEARCH 0x0002
 …
 /*
  * SNAC Family: Buddy icons
  */
+ */
 #define AIM_CB_ICO_ERROR 0x0001
 #define AIM_CB_ICO_REQUEST 0x0004
 …
+ *
  * Most of these are actually special.
  */
+ */
 #define AIM_CB_ICQ_ERROR 0x0001
 #define AIM_CB_ICQ_OFFLINEMSG 0x00f0
 …
  * OFT Services
+ *
  * For all of the above #defines, the number is the subtype
  * of the SNAC.  For OFT #defines, the number is the
  * "hdrtype" which comes after the magic string and OFT
+ * For all of the above #defines, the number is the subtype
+ * of the SNAC.  For OFT #defines, the number is the
+ * "hdrtype" which comes after the magic string and OFT
  * packet length.
+ *
  * I'm pretty sure the ODC ones are arbitrary right now,
+ * I'm pretty sure the ODC ones are arbitrary right now,
  * that should be changed.
  */
 …
  * the SNAC-centered libfaim callback structure.
+ *
  */
+ */
 #define AIM_CB_SPECIAL_AUTHSUCCESS 0x0001
 #define AIM_CB_SPECIAL_AUTHOTHER 0x0002

libfaim/aim_internal.h

-                      rcf02dd6
+                      r7869e48
 };
 /*
+/*
  * In SNACland, the terms 'family' and 'group' are synonymous -- the former
  * is my term, the latter is AOL's.
 …
  * This is inside every connection.  But it is a void * to anything
  * outside of libfaim.  It should remain that way.  It's called data
  * abstraction.  Maybe you've heard of it.  (Probably not if you're a
+ * abstraction.  Maybe you've heard of it.  (Probably not if you're a
  * libfaim user.)
+ *
+ *
  */
 typedef struct aim_conn_inside_s {

libfaim/auth.c

-                      rcf02dd6
+                      r7869e48
  * Family 0x0017 - Authentication.
+ *
  * Deals with the authorizer for SNAC-based login, and also old-style
+ * Deals with the authorizer for SNAC-based login, and also old-style
  * non-SNAC login.
+ *
 …
+ *
  * The encoding_table seems to be a fixed set of values.  We'll
  * hope it doesn't change over time!
+ * hope it doesn't change over time!
+ *
  * This is only used for the XOR method, not the better MD5 method.
 …
         md5_state_t state;
         md5_init(&state);
+        md5_init(&state);
         md5_append(&state, (const md5_byte_t *)key, strlen(key));
         md5_append(&state, (const md5_byte_t *)password, strlen(password));
 …
         md5_finish(&state, (md5_byte_t *)&passdigest);
         md5_init(&state);
+        md5_init(&state);
         md5_append(&state, (const md5_byte_t *)key, strlen(key));
         md5_append(&state, (const md5_byte_t *)&passdigest, 16);
 …
 /*
  * The FLAP version is sent by itself at the beginning of authorization
  * connections.  The FLAP version is also sent before the cookie when connecting
+ * The FLAP version is sent by itself at the beginning of authorization
+ * connections.  The FLAP version is also sent before the cookie when connecting
  * for other services (BOS, chatnav, chat, etc.).
  */
 …
  *   build  = 0x0013
  *   unknown= (not sent)
+ *
+ *
  * AIM for Linux 1.1.112:
  *   clientstring = "AOL Instant Messenger (SM)"
 …
         aim_tlvlist_free(&tl);
         aim_tx_enqueue(sess, fr);
 …
  * This is sent back as a general response to the login command.
  * It can be either an error or a success, depending on the
  * precense of certain TLVs.
+ * precense of certain TLVs.
+ *
  * The client should check the value passed as errorcode. If
 …
          * have an error url.
          */
         if (aim_tlv_gettlv(tlvlist, 0x0008, 1))
+        if (aim_tlv_gettlv(tlvlist, 0x0008, 1))
                 info->errorcode = aim_tlv_get16(tlvlist, 0x0008, 1);
         if (aim_tlv_gettlv(tlvlist, 0x0004, 1))
 …
          * The email address attached to this account
          *   Not available for ICQ or @mac.com logins.
          *   If you receive this TLV, then you are allowed to use
+         *   If you receive this TLV, then you are allowed to use
          *   family 0x0018 to check the status of your email.
          * XXX - Not really true!
 …
         aim_frame_t fr;
         aim_rxcallback_t userfunc;
         fr.conn = conn;
         if ((userfunc = aim_callhandler(sess, conn, 0x0017, 0x0007)))
                 userfunc(sess, &fr, "");
 …
  * Subtype 0x0006
+ *
  * In AIM 3.5 protocol, the first stage of login is to request login from the
  * Authorizer, passing it the screen name for verification.  If the name is
  * invalid, a 0017/0003 is spit back, with the standard error contents.  If
  * valid, a 0017/0007 comes back, which is the signal to send it the main
  * login command (0017/0002).
+ * In AIM 3.5 protocol, the first stage of login is to request login from the
+ * Authorizer, passing it the screen name for verification.  If the name is
+ * invalid, a 0017/0003 is spit back, with the standard error contents.  If
+ * valid, a 0017/0007 comes back, which is the signal to send it the main
+ * login command (0017/0002).
+ *
  */
 …
         aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
         if (!sess || !conn || !sn)
                 return -EINVAL;
 …
         keystr = aimbs_getstr(bs, keylen);
         /* XXX - When GiantGrayPanda signed on AIM I got a thing asking me to register
          * for the netscape network.  This SNAC had a type 0x0058 TLV with length 10.
+        /* XXX - When GiantGrayPanda signed on AIM I got a thing asking me to register
+         * for the netscape network.  This SNAC had a type 0x0058 TLV with length 10.
          * Data is 0x0007 0004 3e19 ae1e 0006 0004 0000 0005 */
 …
                 ret = userfunc(sess, rx, keystr);
         free(keystr);
+        free(keystr);
         return ret;

libfaim/bart.c

r07ab1cb	r7869e48
2	2	* Family 0x0010 - Server stored buddy art
3	3	*
4		* Used for storing and retrieving your cute little buddy icon
	4	* Used for storing and retrieving your cute little buddy icon
5	5	* from the AIM servers.
6	6	*

libfaim/bos.c

-                      rcf02dd6
+                      r7869e48
         int ret = 0;
         /*
          * TLVs follow
+        /*
+         * TLVs follow
          */
         tlvlist = aim_tlvlist_read(bs);
 …
          * TLV type 0x0002: Maximum number of buddies on deny list.
          */
         if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
+        if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
                 maxdenies = aim_tlv_get16(tlvlist, 0x0002, 1);
 …
         aim_tlvlist_free(&tlvlist);
         return ret;
+        return ret;
+}
 /*
+/*
  * Subtype 0x0004 - Set group permisson mask.
+ *
 …
  *  AIM_VISIBILITYCHANGE_DENYREMOVE: Lets list see you again
+ *
  * list should be a list of
+ * list should be a list of
  * screen names in the form "Screen Name One&ScreenNameTwo&" etc.
+ *
 …
  *   - Allow all users to contact me: Send an AIM_VISIBILITYCHANGE_DENYADD
  *      with only your name on it.
  *   - Allow only users on my Buddy List: Send an
+ *   - Allow only users on my Buddy List: Send an
  *      AIM_VISIBILITYCHANGE_PERMITADD with the list the same as your
  *      buddy list
  *   - Allow only the uesrs below: Send an AIM_VISIBILITYCHANGE_PERMITADD
+ *   - Allow only the uesrs below: Send an AIM_VISIBILITYCHANGE_PERMITADD
  *      with everyone listed that you want to see you.
  *   - Block all users: Send an AIM_VISIBILITYCHANGE_PERMITADD with only
+ *   - Block all users: Send an AIM_VISIBILITYCHANGE_PERMITADD with only
  *      yourself in the list
  *   - Block the users below: Send an AIM_VISIBILITYCHANGE_DENYADD with

libfaim/bstream.c

-                      re374dee
+                      r7869e48
 #define FAIM_INTERNAL
 #include <aim.h>
+#include <aim.h>
 faim_internal int aim_bstream_init(aim_bstream_t *bs, fu8_t *data, int len)
+{
         if (!bs)
                 return -1;
 …
 faim_internal fu8_t aimbs_get8(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 1)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 1)
+                return 0; /* XXX throw an exception */
         bs->offset++;
         return aimutil_get8(bs->data + bs->offset - 1);
+}
 …
 faim_internal fu16_t aimbs_get16(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 2)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 2)
+                return 0; /* XXX throw an exception */
         bs->offset += 2;
         return aimutil_get16(bs->data + bs->offset - 2);
+}
 …
 faim_internal fu32_t aimbs_get32(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 4)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 4)
+                return 0; /* XXX throw an exception */
         bs->offset += 4;
         return aimutil_get32(bs->data + bs->offset - 4);
+}
 …
 faim_internal fu8_t aimbs_getle8(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 1)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 1)
+                return 0; /* XXX throw an exception */
         bs->offset++;
         return aimutil_getle8(bs->data + bs->offset - 1);
+}
 …
 faim_internal fu16_t aimbs_getle16(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 2)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 2)
+                return 0; /* XXX throw an exception */
         bs->offset += 2;
         return aimutil_getle16(bs->data + bs->offset - 2);
+}
 …
 faim_internal fu32_t aimbs_getle32(aim_bstream_t *bs)
+{
         if (aim_bstream_empty(bs) < 4)
                 return 0; /* XXX throw an exception */
+        if (aim_bstream_empty(bs) < 4)
+                return 0; /* XXX throw an exception */
         bs->offset += 4;
         return aimutil_getle32(bs->data + bs->offset - 4);
+}

libfaim/buddylist.c

-                      rcf02dd6
+                      r7869e48
         int ret = 0;
         /*
          * TLVs follow
+        /*
+         * TLVs follow
          */
         tlvlist = aim_tlvlist_read(bs);
 …
          * list.  (This is called the "reverse list" by a certain
          * other IM protocol.)
+         *
+         *
          */
         if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
 …
         aim_tlvlist_free(&tlvlist);
         return ret;
+        return ret;
+}
 …
  * buddy_list = "Screen Name One&ScreenNameTwo&";
+ *
  * XXX Clean this up.
+ * XXX Clean this up.
+ *
  */
 …
         char *tmpptr = NULL;
         if (!buddy_list || !(localcpy = strdup(buddy_list)))
+        if (!buddy_list || !(localcpy = strdup(buddy_list)))
                 return -EINVAL;
 …
+}
 /*
+/*
  * Subtype 0x000b
+ *
 …
         snacid = aim_cachesnac(sess, 0x0003, 0x000b, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0003, 0x000b, 0x0000, snacid);
         aim_putuserinfo(&fr->data, info);
 …
+}
 /*
+/*
  * Subtype 0x000c
+ *
 …
         snacid = aim_cachesnac(sess, 0x0003, 0x000c, 0x0000, NULL, 0);
         aim_putsnac(&fr->data, 0x0003, 0x000c, 0x0000, snacid);
         aimbs_put8(&fr->data, strlen(sn));

libfaim/chat.c

-                      rcf02dd6
+                      r7869e48
 #define FAIM_INTERNAL
 #include <aim.h>
+#include <aim.h>
 #include <string.h>
 …
         buflen = 2 + 1 + strlen(roomname) + 2;
         if (!(buf = malloc(buflen)))
                 return 0;
 …
 /*
  * Join a room of name roomname.  This is the first step to joining an
  * already created room.  It's basically a Service Request for
  * family 0x000e, with a little added on to specify the exchange and room
+ * Join a room of name roomname.  This is the first step to joining an
+ * already created room.  It's basically a Service Request for
+ * family 0x000e, with a little added on to specify the exchange and room
  * name.
  */
 …
         aim_tlvlist_t *tl = NULL;
         struct chatsnacinfo csi;
         if (!sess || !conn || !roomname || !strlen(roomname))
                 return -EINVAL;
 …
         aim_tx_enqueue(sess, fr);
         return 0;
+        return 0;
+}
 …
         int hdrlen;
         aim_bstream_t hdrbs;
         if (!sess || !conn || !sn || !msg || !roomname)
                 return -EINVAL;
 …
          * Sigh.  AOL was rather inconsistent right here.  So we have
          * to play some minor tricks.  Right inside the type 5 is some
          * raw data, followed by a series of TLVs.
+         * raw data, followed by a series of TLVs.
+         *
          */
 …
         hdr = malloc(hdrlen);
         aim_bstream_init(&hdrbs, hdr, hdrlen);
         aimbs_put16(&hdrbs, 0x0000); /* Unknown! */
         aimbs_putraw(&hdrbs, ckstr, sizeof(ckstr)); /* I think... */
 …
         aim_addtlvtochain_chatroom(&itl, 0x2711, exchange, roomname, instance);
         aim_tlvlist_write(&hdrbs, &itl);
         aim_tlvlist_add_raw(&otl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
 …
         aim_tlvlist_free(&itl);
         aim_tlvlist_free(&otl);
         aim_tx_enqueue(sess, fr);
 …
         /*
          * Everything else are TLVs.
          */
+         */
         tlvlist = aim_tlvlist_read(bs);
 …
          * Type 0x0073:  Occupant list.
          */
         if (aim_tlv_gettlv(tlvlist, 0x0073, 1)) {
+        if (aim_tlv_gettlv(tlvlist, 0x0073, 1)) {
                 int curoccupant = 0;
                 aim_tlv_t *tmptlv;
 …
+        }
         /*
+        /*
          * Type 0x00c9: Flags. (AIM_CHATROOM_FLAG)
          */
 …
                 flags = aim_tlv_get16(tlvlist, 0x00c9, 1);
         /*
+        /*
          * Type 0x00ca: Creation time (4 bytes)
          */
 …
                 creationtime = aim_tlv_get32(tlvlist, 0x00ca, 1);
         /*
+        /*
          * Type 0x00d1: Maximum Message Length
          */
 …
                 maxmsglen = aim_tlv_get16(tlvlist, 0x00d1, 1);
         /*
+        /*
          * Type 0x00d2: Unknown. (2 bytes)
          */
 …
                 unknown_d2 = aim_tlv_get16(tlvlist, 0x00d2, 1);
         /*
+        /*
          * Type 0x00d3: Room Description
          */
 …
+                ;
         /*
+        /*
          * Type 0x00d5: Unknown. (1 byte)
          */
 …
         if (aim_tlv_gettlv(tlvlist, 0x000d6, 1))
+                ;
         /*
          * Type 0x00d7: Language 1 ("en")
 …
         if (aim_tlv_gettlv(tlvlist, 0x000d8, 1))
+                ;
         /*
          * Type 0x00d9: Language 2 ("en")
 …
  *                                 and displays the message as normal.)
+ *
  * XXX convert this to use tlvchains
+ * XXX convert this to use tlvchains
  */
 faim_export int aim_chat_send_im(aim_session_t *sess, aim_conn_t *conn, fu16_t flags, const char *msg, int msglen)
+{
+{
         int i;
         aim_frame_t *fr;
 …
+         *
          * This could include other information... We just
          * put in a message TLV however.
+         *
+         * put in a message TLV however.
+         *
          */
         aim_tlvlist_add_frozentlvlist(&otl, 0x0005, &itl);
         aim_tlvlist_write(&fr->data, &otl);
         aim_tlvlist_free(&itl);
         aim_tlvlist_free(&otl);
         aim_tx_enqueue(sess, fr);
 …
  * Subtype 0x0006
+ *
  * We could probably include this in the normal ICBM parsing
+ * We could probably include this in the normal ICBM parsing
  * code as channel 0x0003, however, since only the start
  * would be the same, we might as well do it here.
 …
  *         message string
  *       possibly others
+ *
+ *
  */
 static int incomingmsg(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+{
         aim_userinfo_t userinfo;
         aim_rxcallback_t userfunc;
+        aim_rxcallback_t userfunc;
         int ret = 0;
         fu8_t *cookie;
 …
         /*
          * Start parsing TLVs right away.
+         * Start parsing TLVs right away.
          */
         otl = aim_tlvlist_read(bs);
 …
         /*
          * Type 0x0001: If present, it means it was a message to the
+         * Type 0x0001: If present, it means it was a message to the
          * room (as opposed to a whisper).
          */
 …
                 itl = aim_tlvlist_read(&tbs);
                 /*
+                /*
                  * Type 0x0001: Message.
                  */
+                 */
                 if (aim_tlv_gettlv(itl, 0x0001, 1))
                         msg = aim_tlv_getstr(itl, 0x0001, 1);
                 aim_tlvlist_free(&itl);
+                aim_tlvlist_free(&itl);
+        }

libfaim/chatnav.c

-                      rcf02dd6
+                      r7869e48
          * This looks to be a big hack.  You'll note that this entire
          * SNAC is just a room info structure, but the hard room name,
          * here, is set to "create".
+         * here, is set to "create".
+         *
          * Either this goes on the "list of questions concerning
 …
         aimbs_putraw(&fr->data, ck, strlen(ck));
         /*
+        /*
          * instance
+         *
+         *
          * Setting this to 0xffff apparently assigns the last instance.
+         *
 …
         tlvlist = aim_tlvlist_read(bs);
         /*
+        /*
          * Type 0x0002: Maximum concurrent rooms.
          */
+         */
         if (aim_tlv_gettlv(tlvlist, 0x0002, 1))
                 maxrooms = aim_tlv_get8(tlvlist, 0x0002, 1);
         /*
+        /*
          * Type 0x0003: Exchange information
+         *
          * There can be any number of these, each one
          * representing another exchange.
+         *
+         * representing another exchange.
+         *
          */
         for (curexchange = 0; ((exchangetlv = aim_tlv_gettlv(tlvlist, 0x0003, curexchange+1))); ) {
 …
                 innerlist = aim_tlvlist_read(&tbs);
                 /*
+                /*
                  * Type 0x000a: Unknown.
+                 *
 …
+                        ;
                 /*
+                /*
                  * Type 0x000d: Unknown.
                  */
 …
+                        ;
                 /*
+                /*
                  * Type 0x0004: Unknown
                  */
 …
+                        ;
                 /*
+                /*
                  * Type 0x0002: Unknown
                  */
 …
                         classperms = aim_tlv_get16(innerlist, 0x0002, 1);
                         faimdprintf(sess, 1, "faim: class permissions %x\n", classperms);
+                }
 …
                  * 8 Occupant Peek Allowed
+                 *
                  */
+                 */
                 if (aim_tlv_gettlv(innerlist, 0x00c9, 1))
                         exchanges[curexchange-1].flags = aim_tlv_get16(innerlist, 0x00c9, 1);
                 /*
                  * Type 0x00ca: Creation Date
+                /*
+                 * Type 0x00ca: Creation Date
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00ca, 1))
+                        ;
                 /*
                  * Type 0x00d0: Mandatory Channels?
 …
                  * Type 0x00d2: Maximum Occupancy?
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d2, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d2, 1))
+                        ;
 …
                  * Type 0x00d3: Exchange Description
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d3, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d3, 1))
                         exchanges[curexchange-1].name = aim_tlv_getstr(innerlist, 0x00d3, 1);
                 else
 …
                  * Type 0x00d4: Exchange Description URL
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d4, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00d4, 1))
+                        ;
 …
                  * 1  Room creation allowed
                  * 2  Exchange creation allowed
+                 *
+                 *
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d5, 1)) {
 …
                 /*
                  * Type 0x00d6: Character Set (First Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d6, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d6, 1))
                         exchanges[curexchange-1].charset1 = aim_tlv_getstr(innerlist, 0x00d6, 1);
                 else
                         exchanges[curexchange-1].charset1 = NULL;
                 /*
                  * Type 0x00d7: Language (First Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d7, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d7, 1))
                         exchanges[curexchange-1].lang1 = aim_tlv_getstr(innerlist, 0x00d7, 1);
                 else
 …
                 /*
                  * Type 0x00d8: Character Set (Second Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d8, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d8, 1))
                         exchanges[curexchange-1].charset2 = aim_tlv_getstr(innerlist, 0x00d8, 1);
                 else
 …
                 /*
                  * Type 0x00d9: Language (Second Time)
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00d9, 1))
+                 */
+                if (aim_tlv_gettlv(innerlist, 0x00d9, 1))
                         exchanges[curexchange-1].lang2 = aim_tlv_getstr(innerlist, 0x00d9, 1);
                 else
                         exchanges[curexchange-1].lang2 = NULL;
                 /*
                  * Type 0x00da: Unknown
                  */
                 if (aim_tlv_gettlv(innerlist, 0x00da, 1))
+                if (aim_tlv_gettlv(innerlist, 0x00da, 1))
+                        ;
 …
  * Subtype 0x0009
+ *
  * Since multiple things can trigger this callback, we must lookup the
+ * Since multiple things can trigger this callback, we must lookup the
  * snacid to determine the original snac subtype that was called.
+ *
 …
  *    Nav Short Desc = 8
  *    Nav Instance Info = 16
  * And then everything is really asynchronous.  There is no specific
+ * And then everything is really asynchronous.  There is no specific
  * attachment of a response to a create room request, for example.  Creating
  * the room yields no different a response than requesting the room's info.

libfaim/conn.c

-                      rcf02dd6
+                      r7869e48
 #define FAIM_INTERNAL
 #define FAIM_NEED_CONN_INTERNAL
 #include <aim.h>
+#include <aim.h>
 #ifndef _WIN32
 …
  * In OSCAR, every connection has a set of SNAC groups associated
  * with it.  These are the groups that you can send over this connection
  * without being guarenteed a "Not supported" SNAC error.
+ *
  * The grand theory of things says that these associations transcend
+ * without being guarenteed a "Not supported" SNAC error.
+ *
+ * The grand theory of things says that these associations transcend
  * what libfaim calls "connection types" (conn->type).  You can probably
  * see the elegance here, but since I want to revel in it for a bit, you
+ * see the elegance here, but since I want to revel in it for a bit, you
  * get to hear it all spelled out.
+ *
 …
  * of your modules has just given you a SNAC of the group 0x0004 to send
  * you.  Maybe an IM destined for some twit in Greenland.  So you start
  * at the top of your connection list, looking for a connection that
+ * at the top of your connection list, looking for a connection that
  * claims to support group 0x0004.  You find one.  Why, that neat BOS
  * connection of yours can do that.  So you send it on its way.
 …
  * that connection.  One of the first things you get from this new server
  * is a message saying that indeed it does support the group you were looking
  * for.  So you continue and send rate confirmation and all that.
+ *
+ * for.  So you continue and send rate confirmation and all that.
+ *
  * Then you remember you had that SNAC to send, and now you have a means to
  * do it, and you do, and everyone is happy.  Except the Greenlander, who is
 …
  * to make libfaim work that way.  It would take a fair amount of effort,
  * and probably some client API changes as well.  (Whenever I don't want
  * to do something, I just say it would change the client API.  Then I
+ * to do something, I just say it would change the client API.  Then I
  * instantly have a couple of supporters of not doing it.)
+ *
 …
         aim_tx_cleanqueue(sess, *deadconn);
         if ((*deadconn)->fd != -1)
+        if ((*deadconn)->fd != -1)
                 aim_conn_close(*deadconn);
 …
         aim_conn_t *newconn;
         if (!(newconn = malloc(sizeof(aim_conn_t))))
+        if (!(newconn = malloc(sizeof(aim_conn_t))))
                 return NULL;
         memset(newconn, 0, sizeof(aim_conn_t));
 …
         aim_conn_t *cur, **prev;
         if (!deadconn || !*deadconn)
+        if (!deadconn || !*deadconn)
                 return;
 …
  * Close (but not free) a connection.
+ *
  * This leaves everything untouched except for clearing the
+ * This leaves everything untouched except for clearing the
  * handler list and setting the fd to -1 (used to recognize
  * dead connections).  It will also remove cookies if necessary.
 …
  * @type: Type of connection to look for
+ *

Context Navigation

Changes in / [4626016:4485285]

Legend: