combine-diff: extend --cc logic to Octopus.

diff --git a/quote.c b/quote.c
index 76eb14426581f03d0b15ee4eb720456a0729d1bc..7218a7080d9a4282530b58c013606c86e4a5fdf5 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -126,8 +126,10 @@ static int quote_c_style_counted(const char *name, int namelen,
 
        if (!no_dq)
                EMIT('"');
-       for (sp = name; (ch = *sp++) && (sp - name) <= namelen; ) {
-
+       for (sp = name; sp < name + namelen; sp++) {
+               ch = *sp;
+               if (!ch)
+                       break;
                if ((ch < ' ') || (ch == '"') || (ch == '\\') ||
                    (ch == 0177)) {
                        needquote = 1;