Enhance log_format_has() to understand the "'" modifier.
authorWayne Davison <wayned@samba.org>
Mon, 26 Oct 2009 04:24:48 +0000 (21:24 -0700)
committerWayne Davison <wayned@samba.org>
Mon, 26 Oct 2009 04:24:48 +0000 (21:24 -0700)
log.c

diff --git a/log.c b/log.c
index 61d01ce..889a318 100644 (file)
--- a/log.c
+++ b/log.c
@@ -785,10 +785,12 @@ int log_format_has(const char *format, char esc)
                return 0;
 
        for (p = format; (p = strchr(p, '%')) != NULL; ) {
-               if (*++p == '-')
+               for (p++; *p == '\''; p++) {}
+               if (*p == '-')
                        p++;
                while (isDigit(p))
                        p++;
+               while (*p == '\'') p++;
                if (!*p)
                        break;
                if (*p == esc)