c2html: comparison src/c2html.c

-:537aec525835
+:f463693b5eeb
-/*
+#include <errno.h>
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-*
+#include "c2html.h"
-* Copyright 2014 Mike Becker. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-*   1. Redistributions of source code must retain the above copyright
-*      notice, this list of conditions and the following disclaimer.
-*
-*   2. Redistributions in binary form must reproduce the above copyright
-*      notice, this list of conditions and the following disclaimer in the
-*      documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#include "javacodegen.h"
-#include "ccodegen.h"
-#define INPUTBUF_SIZE 2048
-typedef struct {
-char* outfilename;
-char* infilename;
-int highlight;
-} settings_t;
-typedef struct {
-size_t count;
-size_t capacity;
-size_t maxlinewidth;
-char** lines;
-} inputfile_t;
 inputfile_t *inputfilebuffer(size_t capacity) {
 inputfile_t *inputfile = (inputfile_t*) malloc(sizeof(inputfile_t));
 inputfile->lines = (char**) malloc(capacity * sizeof(char*));
 inputfile->capacity = capacity;
 "  c2html [Options] FILE\n\n"
 " Options:\n"
 "  -h                    Prints this help message\n"
 "  -j                    Highlight Java instead of C source code\n"
 "  -o <output>           Output file (stdout, if not specified)\n"
+"  -H <header>           Prepend header file\n"
+"  -F <footer>           Append footer file\n"
 "  -p                    Disable highlighting (plain text)\n"
 "\n");
 }
 int w = 1, p = 1;
 while ((p*=10) < lnc) w++;
 return w;
 }
+int copyfile(char *filename, FILE *dest) {
+if (!filename) {
+return 0;
+}
+FILE *src = fopen(filename, "r");
+if (src) {
+char buf[4096];
+int r;
+while ((r = fread(buf, 1, 4096, src)) > 0) {
+fwrite(buf, 1, r, dest);
+}
+fclose(src);
+return 0;
+} else {
+return errno;
+}
+}
 int main(int argc, char** argv) {
+int retcode = EXIT_SUCCESS;
 settings_t settings;
-settings.outfilename = NULL;
+memset(&settings, 0, sizeof(settings));
 settings.highlight = 1;
 highlighter_t highlighter;
 memset(&highlighter, 0, sizeof(highlighter));
 highlighter.isdirective = iscdirective;
 highlighter.istype = isctype;
 highlighter.keywords = ckeywords;
 highlighter.parser = cparseline;
 char optc;
-while ((optc = getopt(argc, argv, "hjo:p")) != -1) {
+while ((optc = getopt(argc, argv, "hjo:pH:F:")) != -1) {
 switch (optc) {
 case 'o':
 if (!(optarg[0] == '-' && optarg[1] == 0)) {
 settings.outfilename = optarg;
 }
 break;
+case 'F':
+settings.footerfile = optarg;
+break;
+case 'H':
+settings.headerfile = optarg;
+break;
 case 'j':
 highlighter.isdirective = isjdirective;
 highlighter.istype = isjtype;
 highlighter.keywords = jkeywords;
 highlighter.parser = jparseline;
 if (optind != argc-1) {
 printhelp();
 return 1;
 } else {
 settings.infilename = argv[optind];
+FILE *fout;
+if (settings.outfilename) {
+fout = fopen(settings.outfilename, "w");
+if (!fout) {
+perror("Error opening output file");
+return errno;
+}
+} else {
+fout = stdout;
+}
+if (copyfile(settings.headerfile, fout)) {
+perror("Error opening header file");
+retcode = errno;
+goto prog_end;
+}
 inputfile_t *inputfile = readinput(settings.infilename);
 if (inputfile) {
-FILE *fout;
 char *line;
 if (settings.highlight) {
 line = (char*) malloc(inputfile->maxlinewidth*64);
 } else {
 line = NULL;
-}
-if (settings.outfilename) {
-fout = fopen(settings.outfilename, "w");
-} else {
-fout = stdout;
 }
 fprintf(fout, "<pre>\n");
 int lnw = lnint(inputfile->count);
 for (int i = 0 ; i < inputfile->count ; i++) {
 if (settings.highlight) {
 if (settings.highlight) {
 free(line);
 }
 fprintf(fout, "</pre>\n");
-if (fout != stdout) {
-fclose(fout);
-}
 freeinputfilebuffer(inputfile);
-}
+if (copyfile(settings.footerfile, fout)) {
-return 0;
+perror("Error opening footer file");
-}
+retcode = errno;
 }
+} else {
+perror("Error opening input file");
+retcode = errno;
+}
+prog_end:
+if (fout != stdout) {
+fclose(fout);
+}
+return retcode;
+}
+}

Mercurial > hg > c2html / file comparison

comparison: src/c2html.c

src/c2html.c