code cleanup - stagit-gopher - A git gopher frontend. (mirror)

git clone git://bitreich.org/stagit-gopher/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/stagit-gopher/

Log

Files

Refs

Tags

README

LICENSE

---

commit 9328d2690e118127bcaa5cf9f665d8e7711f7a03

parent 069f105725677ce2784d3d0def156c3115c9e330

Author: Hiltjo Posthuma 

Date:   Tue,  3 May 2016 20:18:37 +0200

code cleanup

Diffstat:
  M stagit-index.c                      |       8 +++-----
  M stagit.c                            |      61 +++++++++----------------------

2 files changed, 21 insertions(+), 48 deletions(-)
---

diff --git a/stagit-index.c b/stagit-index.c

@@ -62,7 +62,7 @@ printtimeshort(FILE *fp, const git_time *intime)
         fputs(out, fp);
 }
 
-int
+void
 writeheader(FILE *fp)
 {
         fputs("\n"
@@ -80,14 +80,12 @@ writeheader(FILE *fp)
               "\n"
               ""
               "\n", fp);
-
-        return 0;
 }
 
-int
+void
 writefooter(FILE *fp)
 {
-        return !fputs("\n
Name
Description
Owner
Last commit
\n\n\n\n", fp);
+        fputs("

diff --git a/stagit.c b/stagit.c

@@ -57,7 +57,7 @@ static const char *relpath = "";
 static const char *repodir;
 
 static char *name = "";
-static char *stripped_name;
+static char *strippedname;
 static char description[255];
 static char cloneurl[1024];
 static int haslicense, hasreadme, hassubmodules;
@@ -246,27 +246,6 @@ xmlencode(FILE *fp, const char *s, size_t len)
         }
 }
 
-/* Some implementations of dirname(3) return a pointer to a static
- * internal buffer (OpenBSD). Others modify the contents of `path` (POSIX).
- * This is a wrapper function that is compatible with both versions.
- * The program will error out if dirname(3) failed, this can only happen
- * with the OpenBSD version. */
-char *
-xdirname(const char *path)
-{
-        char *p, *b;
-
-        if (!(p = strdup(path)))
-                err(1, "strdup");
-        if (!(b = dirname(p)))
-                err(1, "dirname");
-        if (!(b = strdup(b)))
-                err(1, "strdup");
-        free(p);
-
-        return b;
-}
-
 int
 mkdirp(const char *path)
 {
@@ -335,7 +314,7 @@ printtimeshort(FILE *fp, const git_time *intime)
         fputs(out, fp);
 }
 
-int
+void
 writeheader(FILE *fp, const char *title)
 {
         fputs("\n"
@@ -343,9 +322,9 @@ writeheader(FILE *fp, const char *title)
                 "\n"
                 "\n\n", fp);
         xmlencode(fp, description, strlen(description));
         fputs("\n", fp);
@@ -724,15 +701,14 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
         int lc = 0;
         FILE *fp;
 
-        d = xdirname(fpath);
-        if (mkdirp(d)) {
-                free(d);
+        if (strlcpy(tmp, fpath, sizeof(tmp)) >= sizeof(tmp))
+                errx(1, "path truncated: '%s'", fpath);
+        if (!(d = dirname(tmp)))
+                err(1, "dirname");
+        if (mkdirp(d))
                 return -1;
-        }
-        free(d);
 
-        p = fpath;
-        while (*p) {
+        for (p = fpath; *p; p++) {
                 if (*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
                         errx(1, "path truncated: '../%s'", tmp);
                 p++;
@@ -1087,9 +1063,9 @@ main(int argc, char *argv[])
                 name = "";
 
         /* strip .git suffix */
-        if (!(stripped_name = strdup(name)))
+        if (!(strippedname = strdup(name)))
                 err(1, "strdup");
-        if ((p = strrchr(stripped_name, '.')))
+        if ((p = strrchr(strippedname, '.')))
                 if (!strcmp(p, ".git"))
                         *p = '\0';
 
@@ -1162,9 +1138,8 @@ main(int argc, char *argv[])
                                 n = fread(buf, 1, sizeof(buf), rcachefp);
                                 if (ferror(rcachefp))
                                         err(1, "fread");
-                                if (fwrite(buf, 1, n, fp) != n)
-                                        err(1, "fwrite");
-                                if (fwrite(buf, 1, n, wcachefp) != n)
+                                if (fwrite(buf, 1, n, fp) != n ||
+                                    fwrite(buf, 1, n, wcachefp) != n)
                                         err(1, "fwrite");
                         }
                         fclose(rcachefp);