A couple minor tweaks.

diff --git a/compat.c b/compat.c
index ccf9c3d75cfd16dcdaa0ef7c535e38b54cfd8806..a124c20011d2d2a2e4c1bc4679c3e11d42f1f94c 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -353,7 +353,14 @@ int get_default_nno_list(struct name_num_obj *nno, char *to_buf, int to_buf_len,
 {
        struct name_num_item *nni;
        int len = 0, cnt = 0;
-       char pre_char = '\0', post_char = '\0';
+       char delim = '\0', post_delim;
+
+       switch (dup_markup) {
+       case '(': post_delim = ')'; break;
+       case '[': post_delim = ']'; break;
+       case '{': post_delim = '}'; break;
+       default: post_delim = '\0'; break;
+       }
 
        init_nno_saw(nno, 0);
 
@@ -361,26 +368,20 @@ int get_default_nno_list(struct name_num_obj *nno, char *to_buf, int to_buf_len,
                if (nni->main_name) {
                        if (!dup_markup)
                                continue;
-                       pre_char = dup_markup;
-                       switch (pre_char) {
-                       case '(': post_char = ')'; break;
-                       case '[': post_char = ']'; break;
-                       case '{': post_char = '}'; break;
-                       default: break;
-                       }
+                       delim = dup_markup;
                }
                if (len)
                        to_buf[len++]= ' ';
-               if (pre_char) {
-                       to_buf[len++]= pre_char;
-                       pre_char = '\0';
+               if (delim) {
+                       to_buf[len++]= delim;
+                       delim = post_delim;
                }
                len += strlcpy(to_buf+len, nni->name, to_buf_len - len);
                if (len >= to_buf_len - 3)
                        exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE... */
-               if (post_char) {
-                       to_buf[len++]= post_char;
-                       post_char = '\0';
+               if (delim) {
+                       to_buf[len++]= delim;
+                       delim = '\0';
                }
                nno->saw[nni->num] = ++cnt;
        }
@@ -411,9 +412,8 @@ static void send_negotiate_str(int f_out, struct name_num_obj *nno, const char *
        } else
                list_str = NULL;
 
-       if (!list_str || !*list_str) {
-               len = get_default_nno_list(nno, tmpbuf, sizeof tmpbuf, '\0');
-       }
+       if (!list_str || !*list_str)
+               len = get_default_nno_list(nno, tmpbuf, MAX_NSTR_STRLEN, '\0');
 
        if (DEBUG_GTE(NSTR, am_server ? 3 : 2)) {
                if (am_server)

diff --git a/options.c b/options.c
index d5b648cb646231a9e78e36835c25673c44d8c151..1650780e11fe9466037eafc1233759708d7624ea 100644 (file)
--- a/options.c
+++ b/options.c
@@ -605,6 +605,8 @@ static void print_capabilities(enum logcode f)
 #endif
                        "IPv6",
 
+               "batchfiles",
+
 #ifndef HAVE_FTRUNCATE
                "no "
 #endif