]> git.armaanb.net Git - stagit.git/blobdiff - stagit.c
projects / stagit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Redirect stdout to correct file.
[stagit.git] / stagit.c
diff --git a/stagit.c b/stagit.c
index affa318448413fbe68c8c743be7c6fd569f0aefa..9a8ccd0245b1e55af35fad1dd86f3477ec779e22 100644 (file)
--- a/stagit.c
+++ b/stagit.c
@@ -344,6 +344,7 @@ writeheader(FILE *fp, const char *title)
        fputs("<!DOCTYPE html>\n"
                "<html>\n<head>\n"
                "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
+               "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />\n"
                "<title>", fp);
        xmlencode(fp, title, strlen(title));
        if (title[0] && strippedname[0])
@@ -365,11 +366,11 @@ writeheader(FILE *fp, const char *title)
        xmlencode(fp, description, strlen(description));
        fputs("</span></td></tr>", fp);
        if (cloneurl[0]) {
-               fputs("<tr class=\"url\"><td></td><td>git clone <a href=\"", fp);
+               fputs("<tr class=\"url\"><td></td><td><span class=\"clone\">git clone <a href=\"", fp);
                xmlencode(fp, cloneurl, strlen(cloneurl));
                fputs("\">", fp);
                xmlencode(fp, cloneurl, strlen(cloneurl));
-               fputs("</a></td></tr>", fp);
+               fputs("</a></span></td></tr>", fp);
        }
        fputs("<tr><td></td><td>\n", fp);
        fprintf(fp, "<a href=\"%slog.html\">Log</a> | ", relpath);
@@ -394,35 +395,51 @@ writefooter(FILE *fp)
 }
 
 int
-writeblobhtml(FILE *fp, const git_blob *blob)
+syntax_highlight(const char *filename, FILE *fp, const char *s, size_t len)
 {
-       size_t n = 0, i, prev;
-       const char *nfmt = "<a href=\"#l%d\" class=\"line\" id=\"l%d\">%7d</a> ";
+       // Copy STDOUT
+       int stdout_copy = dup(1);
+       // Redirect STDOUT
+       dup2(fileno(fp), 1);
+
+       // Ruby script for syntax highlighting.
+       FILE *child = popen("./highlight", "w");
+       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 through STDIN:
+       int lc;
+       size_t i;
+       for (i = 0; *s && i < len; s++, i++) {
+               if (*s == '\n') lc++;
+               fprintf(child, "%c", *s);
+       }
+
+       pclose(child);
+       // Give back STDOUT.
+       dup2(stdout_copy, 1);
+       return lc;
+}
+
+int
+writeblobhtml(const char *filename, FILE *fp, const git_blob *blob)
+{
+       int lc = 0;
        const char *s = git_blob_rawcontent(blob);
        git_off_t len = git_blob_rawsize(blob);
 
-       fputs("<pre id=\"blob\">\n", fp);
+       fputs("<div id=\"blob\">\n", fp);
 
        if (len > 0) {
-               for (i = 0, prev = 0; i < (size_t)len; i++) {
-                       if (s[i] != '\n')
-                               continue;
-                       n++;
-                       fprintf(fp, nfmt, n, n, n);
-                       xmlencode(fp, &s[prev], i - prev + 1);
-                       prev = i + 1;
-               }
-               /* trailing data */
-               if ((len - prev) > 0) {
-                       n++;
-                       fprintf(fp, nfmt, n, n, n);
-                       xmlencode(fp, &s[prev], len - prev);
-               }
+               lc = syntax_highlight(filename, fp, s, len);
        }
 
-       fputs("</pre>\n", fp);
+       fputs("</div>\n", fp);
 
-       return n;
+       return lc;
 }
 
 void
@@ -694,11 +711,11 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
                xmlencode(fp, ci->summary, strlen(ci->summary));
                fputs("</title>\n", fp);
        }
-       fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/%s.html\" />",
+       fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/%s.html\" />\n",
                ci->oid);
 
        if (ci->author) {
-               fputs("<author><name>", fp);
+               fputs("<author>\n<name>", fp);
                xmlencode(fp, ci->author->name, strlen(ci->author->name));
                fputs("</name>\n<email>", fp);
                xmlencode(fp, ci->author->email, strlen(ci->author->email));
@@ -788,7 +805,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(fp, (git_blob *)obj);
+               lc = writeblobhtml(fpath, fp, (git_blob *)obj);
                if (ferror(fp))
                        err(1, "fwrite");
        }
@@ -1188,7 +1205,7 @@ main(int argc, char *argv[])
        mkdir("commit", S_IRWXU | S_IRWXG | S_IRWXO);
        writeheader(fp, "Log");
        fputs("<table id=\"log\"><thead>\n<tr><td><b>Date</b></td>"
-             "<td><b>Commit message</b></td>"
+             "<td><b>Commit</b></td>"
              "<td><b>Author</b></td><td class=\"num\" align=\"right\"><b>Files</b></td>"
              "<td class=\"num\" align=\"right\"><b>+</b></td>"
              "<td class=\"num\" align=\"right\"><b>-</b></td></tr>\n</thead><tbody>\n", fp);
Personal fork of stagit