Pass in filename not fpath.

[stagit.git] / stagit.c

diff --git a/stagit.c b/stagit.c
index b3f2e161c71a7630b2c26fa0779483ac6eac7cdb..98a18303ec65c96048cb500629696f146ddce360 100644 (file)
--- a/stagit.c
+++ b/stagit.c
@@ -397,24 +397,33 @@ writefooter(FILE *fp)
 int
 syntax_highlight(const char *filename, FILE *fp, const char *s, size_t len)
 {
-       // Ruby script for syntax highlighting.
+       // Flush HTML-file
+       fflush(fp);
+       // Copy STDOUT
+       int stdout_copy = dup(1);
+       // Redirect STDOUT
+       dup2(fileno(fp), 1);
+
+       // Python Pygments script for syntax highlighting.
        FILE *child = popen("./highlight", "w");
-       // Give filename:
+       if (child == NULL) {
+               printf("child is null: %s", strerror(errno));
+               exit(1);
+       }
+       // Give filename through STDIN:
        fprintf(child, "%s\n", filename);
-       // Give code to highlight:
+       // Give code to highlight through STDIN:
        int lc;
        size_t i;
        for (i = 0; *s && i < len; s++, i++) {
                if (*s == '\n') lc++;
-               fputc(*s, child);
+               fprintf(child, "%c", *s);
        }
 
-       // Write returned HTML to the HTML file.
-       char c;
-       while ((c = fgetc(child)) != EOF)
-               fputc(c, fp);
-
        pclose(child);
+       fflush(stdout);
+       // Give back STDOUT.
+       dup2(stdout_copy, 1);
        return lc;
 }
 
@@ -799,7 +808,7 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
        if (git_blob_is_binary((git_blob *)obj)) {
                fputs("<p>Binary file.</p>\n", fp);
        } else {
-               lc = writeblobhtml(fpath, fp, (git_blob *)obj);
+               lc = writeblobhtml(filename, fp, (git_blob *)obj);
                if (ferror(fp))
                        err(1, "fwrite");
        }