\n" - "This man2html converter was written by \n" - "" - "Richard Verhoeven\n" - "\n"); + int i,j = 0; + static char new[NULL_TERMINATED(MED_STR_MAX)]; + + if (strlen(str) * 2 + 1 > MED_STR_MAX) { + fprintf(stderr, + "man2html: escape_input - str too long:\n%-80s...\n", + str); + exit(EXIT_FAILURE); + } + + for (i = 0; i < strlen(str); i++) { + if (!( ((str[i] >= 'A') && (str[i] <= 'Z')) || + ((str[i] >= 'a') && (str[i] <= 'z')) || + ((str[i] >= '0') && (str[i] <= '9')) )) { + new[j] = '\\'; + j++; + } + new[j] = str[i]; + j++; + } + new[j] = '\0'; + return new; +} + +static FILE *pipe_open(char *cmd, char *filename) +{ + FILE *pipe_stream = NULL; + char cmdline[NULL_TERMINATED(LARGE_STR_MAX)]; + + if (strlen(filename) * 2 + 1 + strlen(cmd) + 1 > LARGE_STR_MAX) { + fprintf(stderr, "man2html: pipe_open - str too long:\n%-80s...\n", + filename); + return NULL; + } + strmaxcpy(cmdline, cmd, LARGE_STR_MAX); + strmaxcat(cmdline, " ", LARGE_STR_MAX); + strmaxcat(cmdline, escape_input(filename), LARGE_STR_MAX); + + pipe_stream = popen(cmdline, "r"); /* Potentially dangerious - CGI access to sh */ + /* fprintf(stderr, "openned %s %s\n", cmdline, filename); */ + return pipe_stream; +} + +static int pipe_close(FILE *f) +{ + return pclose(f); +} + + +static void usage(void) +{ + char buffer[NULL_TERMINATED(LARGE_STR_MAX)]; + FILE *toplevel = fopen(TOPLEVELDOC, "r"); + + if (!toplevel && errno == ENOENT) { + fputs("Content-type: text/html\n\n" + "
\n" + "\n"
+ "This man2html converter was written by \n"
+ ""
+ "Richard Verhoeven\n"
+ "\n", stdout);
+ exit(0);
+ }
+
+ if (!toplevel) {
+ fprintf(stderr, "man2html: error openning %s: %s\n", TOPLEVELDOC, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ while (fgets(buffer, LARGE_STR_MAX, toplevel)) {
+ fputs(buffer,stdout);
+ }
+ if (!feof(toplevel)) {
+ fprintf(stderr, "man2html: error reading %s: %s\n", TOPLEVELDOC, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ fclose(toplevel);
exit(0);
}
+
+
/* below this you should not change anything unless you know a lot
** about this program or about troff.
*/
@@ -177,15 +379,15 @@
#define INDEXFILE "/tmp/manindex.list"
-char *fname;
-FILE *idxfile;
+static char *fname;
+static FILE *idxfile;
-STRDEF *chardef, *strdef, *defdef;
-INTDEF *intdef;
+static STRDEF *chardef, *strdef, *defdef;
+static INTDEF *intdef;
#define V(A,B) ((A)*256+(B))
-INTDEF standardint[] = {
+static INTDEF standardint[] = {
{ V('n',' '), NROFF,0, NULL },
{ V('t',' '), 1-NROFF,0, NULL },
{ V('o',' '), 1,0, NULL },
@@ -197,7 +399,7 @@
{ V('.','V'), 1,0, NULL }, /* the me package tests for this */
{ 0, 0, 0, NULL } };
-STRDEF standardstring[] = {
+static STRDEF standardstring[] = {
{ V('R',' '), 1, "®", NULL },
{ V('l','q'), 2, "``", NULL },
{ V('r','q'), 2, "''", NULL },
@@ -205,7 +407,7 @@
};
-STRDEF standardchar[] = {
+static STRDEF standardchar[] = {
{ V('*','*'), 1, "*", NULL },
{ V('*','A'), 1, "A", NULL },
{ V('*','B'), 1, "B", NULL },
@@ -307,40 +509,41 @@
/* default: print code */
-char eqndelimopen=0, eqndelimclose=0;
-char escapesym='\\', nobreaksym='\'', controlsym='.', fieldsym=0, padsym=0;
+static char eqndelimopen=0, eqndelimclose=0;
+static char escapesym='\\', nobreaksym='\'', controlsym='.', fieldsym=0, padsym=0;
-char *buffer=NULL;
-int buffpos=0, buffmax=0;
-int scaninbuff=0;
-int itemdepth=0;
-int dl_set[20]= { 0 };
-int still_dd=0;
-int tabstops[20] = { 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96 };
-int maxtstop=12;
-int curpos=0;
+static char *buffer=NULL;
+static int buffpos=0, buffmax=0;
+static int scaninbuff=0;
+static int itemdepth=0;
+static int dl_set[20]= { 0 };
+static int still_dd=0;
+static int tabstops[20] = { 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96 };
+static int maxtstop=12;
+static int curpos=0;
-extern char *scan_troff(char *c, int san, char **result);
+static char *scan_troff(char *c, int san, char **result);
+static char *scan_troff_mandoc(char *c, int san, char **result);
static char **argument=NULL;
-static char charb[3];
+static char charb[TINY_STR_MAX];
-void print_sig(void)
+static void print_sig(void)
{
- char datbuf[500];
+ char datbuf[NULL_TERMINATED(MED_STR_MAX)];
struct tm *timetm;
time_t clock;
datbuf[0]='\0';
#ifdef TIMEFORMAT
clock=time(NULL);
timetm=gmtime(&clock);
- strftime(datbuf,500,TIMEFORMAT, timetm);
+ strftime(datbuf,MED_STR_MAX,TIMEFORMAT, timetm);
#endif
printf(signature, datbuf);
}
-char *expand_char(int nr)
+static char *expand_char(int nr)
{
STRDEF *h;
h=chardef;
@@ -353,12 +556,17 @@
h=h->next;
charb[0]=nr/256;
charb[1]=nr%256;
- charb[2]='\0';
+ charb[2]='\0';
+ if (charb[0] == '<') { /* Fix up <= */
+ charb[4] = charb[1];
+ strncpy(charb, "<", 4);
+ charb[5] = '\0';
+ }
curpos+=2;
return charb;
}
-char *expand_string(int nr)
+static char *expand_string(int nr)
{
STRDEF *h=strdef;
if (!nr) return NULL;
@@ -371,15 +579,97 @@
return NULL;
}
+static char *trim_compress_suffix(char *filename)
+{
+ static char result[NULL_TERMINATED(MED_STR_MAX)];
+ int trim;
+ if (strcmp(filename + strlen(filename) - 3, ".gz") == 0) {
+ trim = 3;
+ }
+ else if (strcmp(filename + strlen(filename) - 2, ".Z") == 0
+ || strcmp(filename + strlen(filename) - 2, ".z") == 0) {
+ trim = 2;
+ }
+ else
+ trim = 0;
+
+ strlimitcpy(result, filename, strlen(filename) - trim, MED_STR_MAX);
+ result[strlen(filename) - trim + 1] = '\0';
+ return result;
+}
+
+static char *read_man_page(char *filename)
+{
+ int man_pipe = 0;
+ char *man_buf = NULL;
+ int i;
+
+#ifndef DISABLE_ZCATS
+ for (i = 0; zcats[i]; i++) {
+ if (strcmp(filename + strlen(filename) - strlen(zcats[i]), zcats[i]) == 0) {
+ man_pipe = 1;
+ break;
+ }
+ }
+#endif
+
+ if (man_pipe) { /* Input from a pipe */
+#ifndef DISABLE_ZCATS
+ FILE *man_stream = NULL;
+ int upto;
+ int len;
+ man_stream = pipe_open(zcats[i] + strlen(zcats[i]) + 1, filename);
+ /* fprintf(stderr, "openned .%s.\n", filename); */
+ if (man_stream) {
+ man_buf = stralloc(LARGE_STR_MAX + 5);
+ man_buf[0] = '\n';
+ for (upto = 1;
+ (len = fread(man_buf + upto, 1, LARGE_STR_MAX, man_stream)) > 0;
+ upto += len) {
+ man_buf = strgrow(man_buf, LARGE_STR_MAX);
+ }
+ man_buf[upto] = '\n';
+ man_buf[upto + 1] = man_buf[upto + 2] = '\0';
+ pipe_close(man_stream);
+ }
+#endif
+ }
+ else { /* Non-pipe input */
+ FILE *man_stream = NULL;
+ struct stat stbuf;
+ int buf_size;
+ if (stat(filename, &stbuf) == -1) {
+ return NULL;
+ }
+ buf_size = stbuf.st_size;
+ man_buf = stralloc(buf_size+5);
+ man_pipe = 0;
+ man_stream = fopen(filename, "r");
+ if (man_stream) {
+ man_buf[0] = '\n';
+ if (fread(man_buf+1, 1, buf_size, man_stream) == buf_size) {
+ man_buf[buf_size] = '\n';
+ man_buf[buf_size + 1] = man_buf[buf_size + 2] = '\0';
+ }
+ else {
+ man_buf = NULL;
+ }
+ fclose(man_stream);
+ }
+ }
+ /* fprintf(stderr, "read .%s.\n", filename); */
+ return man_buf;
+}
+
-char outbuffer[1024];
-int obp=0;
-int no_newline_output=0;
-int newline_for_fun=0;
-int output_possible=0;
-int out_length=0;
+static char outbuffer[NULL_TERMINATED(HUGE_STR_MAX)];
+static int obp=0;
+static int no_newline_output=0;
+static int newline_for_fun=0;
+static int output_possible=0;
+static int out_length=0;
-void add_links(char *c)
+static void add_links(char *c)
{
/*
** Add the links to the output.
@@ -423,13 +713,13 @@
char t;
t=*g;
*g='\0';
- printf("%s",c);
+ fputs(c, stdout);
*g=t;*h='\0';
printf("%s>", g,g);
c=f+6;
} else {
f[5]='\0';
- printf("%s",c);
+ fputs(c, stdout);
f[5]=';';
c=f+5;
}
@@ -460,22 +750,26 @@
h--;
t=*h;
*h='\0';
- printf("%s", c);
+ fputs(c, stdout);
*h=t;
t=*e;
*e='\0';
if (subsec)
- printf("%s",
+ printf("%s",
sec, h, sec, tolower(subsec), h);
else
- printf("%s",
+ printf("%s",
sec, h, sec, h);
*e=t;
c=e;
}
}
*f='\0';
- printf("%s", c);
+ fputs(c, stdout);
*f='(';
idtest[4]=f-1;
c=f;
@@ -489,7 +783,7 @@
if (g-f>4) {
char t;
t=*f; *f='\0';
- printf("%s",c);
+ fputs(c, stdout);
*f=t; t=*g;*g='\0';
printf("%s", (j==3?"ftp":"http"),
f,f);
@@ -497,7 +791,7 @@
c=g;
} else {
f[3]='\0';
- printf("%s",c);
+ fputs(c, stdout);
c=f+3;
f[3]='.';
}
@@ -514,14 +808,14 @@
char t;
t=*g;
*g='\0';
- printf("%s",c);
+ fputs(c, stdout);
*g=t;t=*h;*h='\0';
printf("%s",g,g);
*h=t;
c=h;
} else {
*f='\0';
- printf("%s",c);
+ fputs(c, stdout);
*f='@';
idtest[1]=c;
c=f;
@@ -537,14 +831,14 @@
char t;
t=*g;
*g='\0';
- printf("%s", c);
+ fputs(c, stdout);
*g=t; t=*h; *h='\0';
printf("%s", g,g);
*h=t;
c=h;
} else {
f[1]='\0';
- printf("%s", c);
+ fputs(c, stdout);
f[1]='/';
c=f+1;
}
@@ -561,14 +855,14 @@
if (idtest[5] && idtest[5] \n"); else {
+ out_html(NEWLINE);
+ NEWLINE[0]='\n';
+ }
+ curpos=0;
+ c=skip_till_newline(c);
+ break;
+ }
+ case V('E','l'): /* BSD mandoc */
+ c=c+j;
+ if (dl_set[itemdepth] & BL_DESC_LIST) {
+ out_html(" \n"); else {
+ out_html(NEWLINE);
+ NEWLINE[0]='\n';
+ }
+ curpos=0;
+ c=skip_till_newline(c);
+ break;
+ case V('I','t'): /* BSD mandoc */
+ c=c+j;
+ if (strncmp(c, "Xo", 2) == 0 && isspace(*(c+2))) {
+ c = skip_till_newline(c);
+ }
+ if (dl_set[itemdepth] & BL_DESC_LIST) {
+ out_html(" "); else {
+ out_html(NEWLINE);
+ NEWLINE[0]='\n';
+ }
+ curpos=0;
+ c=skip_till_newline(c);
+ break;
+ case V('X','r'): /* BSD mandoc */
+ {
+ /* Translate xyz 1 to xyz(1)
+ * Allow for multiple spaces. Allow the section to be missing.
+ */
+ char buff[NULL_TERMINATED(MED_STR_MAX)];
+ char *bufptr;
+ trans_char(c,'"','\a');
+ bufptr = buff;
+ c = c+j;
+ if (*c == '\n') c++; /* Skip spaces */
+ while (isspace(*c) && *c != '\n') c++;
+ while (isalnum(*c)) { /* Copy the xyz part */
+ *bufptr = *c;
+ bufptr++; if (bufptr >= buff + MED_STR_MAX) break;
+ c++;
+ }
+ while (isspace(*c) && *c != '\n') c++; /* Skip spaces */
+ if (isdigit(*c)) { /* Convert the number if there is one */
+ *bufptr = '(';
+ bufptr++;
+ if (bufptr < buff + MED_STR_MAX) {
+ while (isalnum(*c)) {
+ *bufptr = *c;
+ bufptr++; if (bufptr >= buff + MED_STR_MAX) break;
+ c++;
+ }
+ if (bufptr < buff + MED_STR_MAX) {
+ *bufptr = ')';
+ bufptr++;
+ }
+ }
+ }
+
+ while (*c != '\n') { /* Copy the remainder */
+ if (!isspace(*c)) {
+ *bufptr = *c;
+ bufptr++; if (bufptr >= buff + MED_STR_MAX) break;
+ }
+ c++;
+ }
+ *bufptr = '\n';
+ scan_troff_mandoc(buff, 1, NULL);
+
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ }
+ break;
+ case V('F','l'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ out_html("-");
+ if (*c!='\n') {
+ out_html(change_to_font('B'));
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ }
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('P','a'): /* BSD mandoc */
+ case V('P','f'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('P','p'): /* BSD mandoc */
+ if (fillout) out_html(" \n"); else {
+ out_html(NEWLINE);
+ NEWLINE[0]='\n';
+ }
+ curpos=0;
+ c=skip_till_newline(c);
+ break;
+ case V('D','q'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html("``");
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html("''");
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('O','p'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html(change_to_font('R'));
+ out_html("[");
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ out_html("]");
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('O','o'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html(change_to_font('R'));
+ out_html("[");
+ c=scan_troff_mandoc(c, 1, NULL);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('O','c'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ out_html("]");
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('P','q'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html("(");
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(")");
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('Q','l'): /* BSD mandoc */
+ { /* Single quote first word in the line */
+ char *sp;
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ sp = c;
+ do { /* Find first whitespace after the
+ * first word that isn't a mandoc macro
+ */
+ while (*sp && isspace(*sp)) sp++;
+ while (*sp && !isspace(*sp)) sp++;
+ } while (*sp && isupper(*(sp-2)) && islower(*(sp-1)));
+
+ /* Use a newline to mark the end of text to
+ * be quoted
+ */
+ if (*sp) *sp = '\n';
+ out_html("`"); /* Quote the text */
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html("'");
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ }
+ case V('S','q'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html("`");
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html("'");
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('A','r'): /* BSD mandoc */
+ /* parse one line in italics */
+ out_html(change_to_font('I'));
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') { /* An empty Ar means "file ..." */
+ out_html("file ...");
+ }
+ else {
+ c=scan_troff_mandoc(c, 1, NULL);
+ }
+ out_html(change_to_font('R'));
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('A','d'): /* BSD mandoc */
+ case V('E','m'): /* BSD mandoc */
+ case V('V','a'): /* BSD mandoc */
+ case V('X','c'): /* BSD mandoc */
+ /* parse one line in italics */
+ out_html(change_to_font('I'));
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('N','d'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html(" - ");
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('N','m'): /* BSD mandoc */
+ {
+ static char mandoc_name[NULL_TERMINATED(SMALL_STR_MAX)] = "";
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (mandoc_synopsis) { /* Break lines only in the Synopsis.
+ * The Synopsis section seems to be treated
+ * as a special case - Bummer!
+ */
+ static int count = 0; /* Don't break on the first Nm */
+ if (count) {
+ out_html("\n");
+ strmaxcpy(manidx+mip, "
\n");
itemdepth--;
@@ -2230,15 +2540,20 @@
c=scan_troff(c,1,NULL);
out_html(change_to_size('0'));
break;
+ case V('S','s'): /* BSD mandoc */
+ mandoc_command = 1;
case V('S','S'):
mode=1;
+ case V('S','h'): /* BSD mandoc */
+ /* hack for fallthru from above */
+ mandoc_command = !mode || mandoc_command;
case V('S','H'):
c=c+j;
if (*c=='\n') c++;
while (itemdepth || dl_set[itemdepth]) {
out_html("\n");
if (dl_set[itemdepth]) dl_set[itemdepth]=0;
- else itemdepth--;
+ else if (itemdepth > 0) itemdepth--;
}
out_html(change_to_font(0));
out_html(change_to_size(0));
@@ -2253,7 +2568,8 @@
/* for mosaic users */
if (mode) out_html("\"> \n\n", HUGE_STR_MAX - mip);
mip+=5;
}
}
@@ -1677,7 +1972,7 @@
while (manidx[mip]) mip++;
}
-char *skip_till_newline(char *c)
+static char *skip_till_newline(char *c)
{
int lvl=0;
@@ -1696,13 +1991,18 @@
return c;
}
-int ifelseval=0;
+static int ifelseval=0;
-char *scan_request(char *c)
+static char *scan_request(char *c)
{
+ /* BSD Mandoc stuff */
+ static int mandoc_synopsis=0; /* True if we are in the synopsis section */
+ static int mandoc_command=0; /* True if this is mandoc page */
+ static int mandoc_bd_options; /* Only copes with non-nested Bd's */
+
int i,j,mode=0;
char *h;
- char *wordlist[20];
+ char *wordlist[MAX_WORDLIST];
int words;
char *sl;
STRDEF *owndef;
@@ -1725,9 +2025,9 @@
*h='\0';
if (scaninbuff && buffpos) {
buffer[buffpos]='\0';
- printf("%s\n", buffer);
+ puts(buffer);
}
- fprintf(stderr, "%s\n", c+2);
+ /* fprintf(stderr, "%s\n", c+2); */
exit(0);
break;
case V('d','i'):
@@ -1939,7 +2239,7 @@
if (*c!='\n') {
endwith=c-1;i=1;
c[-1]='.';
- while (*c!='\n') c++,i++;
+ while (*c && *c!='\n') c++,i++;
}
c++;
while (*c && strncmp(c,endwith,i)) while (*c++!='\n');
@@ -1982,7 +2282,8 @@
{
FILE *f;
struct stat stbuf;
- int l;char *buf;
+ int l = 0;
+ char *buf;
char *name=NULL;
curpos=0;
c=c+j;
@@ -1999,7 +2300,7 @@
scan_troff(h,1, &name);
if (name[3]=='/') h=name+3; else h=name;
if (stat(h, &stbuf)!=-1) l=stbuf.st_size;
- buf = (char*) malloc((l+4)*sizeof(char));
+ buf = stralloc(l+4);
#if NOCGI
if (!out_length) {
char *t,*s;
@@ -2016,13 +2317,17 @@
#endif
{
/* this works alright, except for section 3 */
- f=fopen(h,"r");
- if (!f || !buf || !l)
- fprintf(stderr, "Unable to open or read file %s.\n",
+ buf=read_man_page(h);
+ if (!buf) {
+
+ fprintf(stderr, "man2html: unable to open or read file %s.\n",
h);
+ out_html("
");
out_html(""
+ "man2html: unable to open or read file.\n");
+ out_html(h);
+ out_html("
\n");
+ }
else {
- i=fread(buf+1,1,l,f);
- fclose(f);
buf[0]=buf[l]='\n';
buf[l+1]=buf[l+2]='\0';
scan_troff(buf+1,0,NULL);
@@ -2063,7 +2368,7 @@
h=c;
while (*c!='\n') c++;
*c='\0';
- fprintf(stderr,"%s\n", h);
+ /* fprintf(stderr,"%s\n", h); */
*c='\n';
break;
case V('B',' '):
@@ -2094,7 +2399,8 @@
case V('R','B'):
case V('R','I'):
{
- char font[2] = { c[0], c[1] };
+ char font[2] ;
+ font[0] = c[0]; font[1] = c[1];
c=c+j;
if (*c=='\n') c++;
sl=fill_words(c, wordlist, &words);
@@ -2193,7 +2499,10 @@
c=skip_till_newline(c);
curpos=0;
break;
- case V('P','D'): c=skip_till_newline(c); break;
+ case V('P','D'):
+ c=skip_till_newline(c);
+ break;
+ case V('R','s'): /* BSD mandoc */
case V('R','S'):
sl=fill_words(c+j, wordlist, &words);
j=1;
@@ -2206,8 +2515,9 @@
curpos=0;
break;
}
+ case V('R','e'): /* BSD mandoc */
case V('R','E'):
- if (itemdepth) {
+ if (itemdepth > 0) {
if (dl_set[itemdepth]) out_html("");
else out_html("\"> \n
\n");
else out_html("\n");
curpos=0;
@@ -2261,6 +2577,8 @@
case V('T','S'):
c=scan_table(c);
break;
+ case V('D','t'): /* BSD mandoc */
+ mandoc_command = 1;
case V('T','H'):
if (!output_possible) {
sl = fill_words(c+j, wordlist, &words);
@@ -2284,7 +2602,11 @@
} else out_html(")");
out_html("");
- c=scan_troff(c,1,NULL);
+ mandoc_synopsis = strncmp(c, "SYNOPSIS", 8) == 0;
+ c = mandoc_command ? scan_troff_mandoc(c,1,NULL) : scan_troff(c,1,NULL);
if (mode) out_html("
Index\n");
*sl='\n';
+ fputs("
Return to Main Contents\n", stdout);
out_html("
\n");
+ if (mandoc_command) out_html("
BSD mandoc
");
}
c=sl+1;
} else c=skip_till_newline(c);
@@ -2387,7 +2709,7 @@
while (de && de->nr!= i) de=de->next;
if (mode && de) olen=strlen(de->st);
j=olen+c-sl;
- h= (char*) malloc((j*2+4)*sizeof(char));
+ h = stralloc(j*2+4);
if (h) {
for (j=0; j\n");
+ }
+ else if (strstr(list_options, "-enum")) { /* HTML Ordered List */
+ dl_set[itemdepth] = BL_ENUM_LIST;
+ out_html("
\n");
+ }
+ else if (dl_set[itemdepth] & BL_ENUM_LIST) {
+ out_html("\n");
+ }
+ dl_set[itemdepth]=0;
+ if (itemdepth > 0) itemdepth--;
+ if (fillout) out_html("\n");
+ }
+ else { /* HTML Descriptive List */
+ dl_set[itemdepth] = BL_DESC_LIST;
+ out_html("
\n");
+ }
+ if (fillout) out_html("
\n");
+ }
+ else if (dl_set[itemdepth] & BL_BULLET_LIST) {
+ out_html("");
+ out_html(change_to_font('L'));
+ if (*c=='\n') c++;
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ out_html("
");
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('B','d'): /* BSD mandoc */
+ { /* Seems like a kind of example/literal mode */
+ char bd_options[NULL_TERMINATED(MED_STR_MAX)];
+ char *nl = strchr(c,'\n');
+ c=c+j;
+ if (nl) {
+ strlimitcpy(bd_options, c, nl - c, MED_STR_MAX);
+ }
+ out_html(NEWLINE);
+ mandoc_bd_options = 0; /* Remember options for terminating Bl */
+ if (strstr(bd_options, "-offset indent")) {
+ mandoc_bd_options |= BD_INDENT;
+ out_html("\n");
+ }
+ if ( strstr(bd_options, "-literal")
+ || strstr(bd_options, "-unfilled")) {
+ if (fillout) {
+ mandoc_bd_options |= BD_LITERAL;
+ out_html(change_to_font(0));
+ out_html(change_to_size('0'));
+ out_html("
\n");
+ curpos=0;
+ fillout=1;
+ c=skip_till_newline(c);
+ break;
+ case V('B','e'): /* BSD mandoc */
+ c=c+j;
+ if (fillout) out_html("\n");
+ }
+ curpos=0;
+ fillout=0;
+ }
+ c=skip_till_newline(c);
+ break;
+ }
+ case V('E','d'): /* BSD mandoc */
+ if (mandoc_bd_options & BD_LITERAL) {
+ if (!fillout) {
+ out_html(change_to_font(0));
+ out_html(change_to_size('0'));
+ out_html("\n");
+ }
+ }
+ if (mandoc_bd_options & BD_INDENT)
+ out_html("
");
+ }
+ else {
+ char *end = strchr(c, '\n');
+ if (end) { /* Remember the name for later. */
+ strlimitcpy(mandoc_name, c, end - c, SMALL_STR_MAX);
+ }
+ }
+ count++;
+ }
+ out_html(change_to_font('B'));
+ while (*c == ' '|| *c == '\t') c++;
+ if (*c == '\n') { /* If Nm has no argument, use one from an earlier
+ * Nm command that did have one. Hope there aren't
+ * too many commands that do this.
+ */
+ out_html(mandoc_name);
+ }
+ else {
+ c=scan_troff_mandoc(c, 1, NULL);
+ }
+ out_html(change_to_font('R'));
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ }
+ case V('C','d'): /* BSD mandoc */
+ case V('C','m'): /* BSD mandoc */
+ case V('I','c'): /* BSD mandoc */
+ case V('M','s'): /* BSD mandoc */
+ case V('O','r'): /* BSD mandoc */
+ case V('S','y'): /* BSD mandoc */
+ /* parse one line in bold */
+ out_html(change_to_font('B'));
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('D','v'): /* BSD mandoc */
+ case V('E','v'): /* BSD mandoc */
+ case V('F','r'): /* BSD mandoc */
+ case V('L','i'): /* BSD mandoc */
+ case V('N','o'): /* BSD mandoc */
+ case V('N','s'): /* BSD mandoc */
+ case V('T','n'): /* BSD mandoc */
+ case V('n','N'): /* BSD mandoc */
+ trans_char(c,'"','\a');
+ c=c+j;
+ if (*c=='\n') c++;
+ out_html(change_to_font('B'));
+ c=scan_troff_mandoc(c, 1, NULL);
+ out_html(change_to_font('R'));
+ out_html(NEWLINE);
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('%','A'): /* BSD mandoc biblio stuff */
+ case V('%','D'):
+ case V('%','N'):
+ case V('%','O'):
+ case V('%','P'):
+ case V('%','Q'):
+ case V('%','V'):
+ c=c+j;
+ if (*c=='\n') c++;
+ c=scan_troff(c, 1, NULL); /* Don't allow embedded mandoc coms */
+ if (fillout) curpos++; else curpos=0;
+ break;
+ case V('%','B'):
+ case V('%','J'):
+ case V('%','R'):
+ case V('%','T'):
+ c=c+j;
+ out_html(change_to_font('I'));
+ if (*c=='\n') c++;
+ c=scan_troff(c, 1, NULL); /* Don't allow embedded mandoc coms */
+ out_html(change_to_font('R'));
+ if (fillout) curpos++; else curpos=0;
+ break;
default:
/* search macro database of self-defined macros */
owndef = defdef;
@@ -2429,7 +3207,12 @@
for (i=1;i\n");
+ fputs("
\n", stdout);
}
- printf("\n", stdout);
strd=foundpages;
while (strd) {
printf("
\n");
+ fputs("