Replace most uses of strncmp() with prefixcmp()

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 861352a5e9e8da1558cde08b3cc076375d138ede..e31962d43bc919c14e08f4ddbd4ff5e8cfc7a4b4 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -1,7 +1,6 @@
 /* cgit.c: cgi for the git scm
  *
 /* cgit.c: cgi for the git scm
  *

- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -864,7 +863,7 @@ static void cgit_parse_args(int argc, const char **argv)
        int scan = 0;
 
        for (i = 1; i < argc; i++) {
        int scan = 0;
 
        for (i = 1; i < argc; i++) {

-               if (!strncmp(argv[i], "--cache=", 8)) {
+               if (!prefixcmp(argv[i], "--cache=")) {

                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                }
                if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                }
                if (!strcmp(argv[i], "--nocache")) {


@@ -873,28 +872,28 @@ static void cgit_parse_args(int argc, const char **argv)
                if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";
                }
                if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";
                }

-               if (!strncmp(argv[i], "--query=", 8)) {
+               if (!prefixcmp(argv[i], "--query=")) {

                        ctx.qry.raw = xstrdup(argv[i] + 8);
                }
                        ctx.qry.raw = xstrdup(argv[i] + 8);
                }

-               if (!strncmp(argv[i], "--repo=", 7)) {
+               if (!prefixcmp(argv[i], "--repo=")) {

                        ctx.qry.repo = xstrdup(argv[i] + 7);
                }
                        ctx.qry.repo = xstrdup(argv[i] + 7);
                }

-               if (!strncmp(argv[i], "--page=", 7)) {
+               if (!prefixcmp(argv[i], "--page=")) {

                        ctx.qry.page = xstrdup(argv[i] + 7);
                }
                        ctx.qry.page = xstrdup(argv[i] + 7);
                }

-               if (!strncmp(argv[i], "--head=", 7)) {
+               if (!prefixcmp(argv[i], "--head=")) {

                        ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;
                }
                        ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;
                }

-               if (!strncmp(argv[i], "--sha1=", 7)) {
+               if (!prefixcmp(argv[i], "--sha1=")) {

                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;
                }
                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;
                }

-               if (!strncmp(argv[i], "--ofs=", 6)) {
+               if (!prefixcmp(argv[i], "--ofs=")) {

                        ctx.qry.ofs = atoi(argv[i] + 6);
                }
                        ctx.qry.ofs = atoi(argv[i] + 6);
                }

-               if (!strncmp(argv[i], "--scan-tree=", 12) ||
-                   !strncmp(argv[i], "--scan-path=", 12)) {
+               if (!prefixcmp(argv[i], "--scan-tree=") ||
+                   !prefixcmp(argv[i], "--scan-path=")) {

                        /* HACK: the global snapshot bitmask defines the
                         * set of allowed snapshot formats, but the config
                         * file hasn't been parsed yet so the mask is
                        /* HACK: the global snapshot bitmask defines the
                         * set of allowed snapshot formats, but the config
                         * file hasn't been parsed yet so the mask is