dmlib: src/dmargs.c comparison

comparison src/dmargs.c @ 2400:01c6a5261962

Sync commandline argument help printing/handling changes from th-libs.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 12 Jan 2020 19:25:52 +0200
parents	c801995cbb13
children	263093248f26

comparison

equal deleted inserted replaced

-:5d391c31ebc9
+:01c6a5261962
 return optionsOK;
 }
-static void dmPad(FILE *outFile, int count)
+void dmPrintPad(FILE *fh, int count, const char och)
 {
 while (count--)
-fputc(' ', outFile);
+fputc(och, fh);
 }
-static void dmPrintWrap(FILE *fh, const char *str, int spad, int rpad, int width)
+/**
+* Print given string indented in such a way that it is automatically
+* line-wrapped as necessary, taking hard linefeeds into account as well.
+* @param fh stdio file handle to output to
+* @param str string to output
+* @param spad starting pad/indent of the first line
+* @param rpad how much to pad the other lines
+* @param width total line width to wrap at
+*/
+void dmPrintWrap(FILE *fh, const char *str,
+const int spad, int const rpad, const int width)
 {
 size_t pos = 0;
 BOOL first = TRUE;
 while (str[pos])
 {
 // Pre-pad line
 int linelen = first ? spad : rpad;
-dmPad(fh, first ? 0 : rpad);
+dmPrintPad(fh, first ? 0 : rpad, ' ');
 first = FALSE;
 // Skip whitespace at line start
-while (isspace(str[pos]) || str[pos] == '\n') pos++;
+while (isspace(str[pos]) || str[pos] == '\n')
+pos++;
 // Handle each word
 while (str[pos] && str[pos] != '\n')
 {
 size_t next;
 int wlen;
-for (wlen = 0, next = pos; str[next] && !isspace(str[next]) && str[next] != '\n'; next++, wlen++);
-//            fprintf(stdout, "X '%c', %d .. linelen=%d/%d, wlen=%d\n", str[pos], pos, linelen, width, wlen);
+// Find word length and next break
-if (linelen + wlen < width)
+for (wlen = 0, next = pos;
-{
+str[next] && !isspace(str[next]) &&
-for (;pos < next; pos++, linelen++)
+str[next] != '\n';
-fputc(str[pos], fh);
+next++, wlen++);
-if (str[next] == '\n' || str[next] == 0)
+// Check if we have too much of text?
-{
+if (linelen + wlen >= width)
-fprintf(fh, "\n");
+break;
-break;
-}
+// Print what we have
-else
+for (;pos < next; pos++, linelen++)
-{
+fputc(str[pos], fh);
-fputc(str[pos], fh);
-pos++;
+// Check if we are at end of input or hard linefeed
-linelen++;
+if (str[next] == '\n' || str[next] == 0)
-}
+break;
-}
 else
 {
-fprintf(fh, "\n");
+fputc(str[pos], fh);
-break;
+pos++;
-}
+linelen++;
 }
+}
+fprintf(fh, "\n");
+}
+}
+static inline const char *dmArgsGetOptArg(const DMOptArg *opt)
+{
+#ifdef DM_USE_OPT_ARG
+return opt->o_arg != NULL ? opt->o_arg : "ARG";
+#else
+(void) opt;
+return "ARG";
+#endif
+}
+static void dmArgsPrintHelpPrintItem(FILE *fh, const DMOptArg *opt, int *lineWidth, const int maxLineWidth, const BOOL doPrint)
+{
+const char *arg = dmArgsGetOptArg(opt);
+char fmtBuf[32];
+int padWidth;
+BOOL hasLongOpt = opt->o_long != NULL;
+if (opt->o_short != 0)
+{
+if (!hasLongOpt && (opt->flags & OPT_ARGREQ))
+{
+snprintf(fmtBuf, sizeof(fmtBuf), " -%c <%s>",
+opt->o_short, arg);
+}
+else
+{
+snprintf(fmtBuf, sizeof(fmtBuf), " -%c,",
+opt->o_short);
+}
+*lineWidth = strlen(fmtBuf);
+if (doPrint)
+padWidth = hasLongOpt ? 2 : maxLineWidth - *lineWidth;
+else
+padWidth = 2;
+}
+else
+{
+fmtBuf[0] = 0;
+*lineWidth = 0;
+padWidth = 4 + 2;
+}
+if (doPrint)
+{
+fputs(fmtBuf, fh);
+dmPrintPad(fh, padWidth, ' ');
+}
+*lineWidth += padWidth;
+if (hasLongOpt)
+{
+if (opt->flags & OPT_ARGREQ)
+{
+snprintf(fmtBuf, sizeof(fmtBuf), "--%s=<%s>",
+opt->o_long, arg);
+}
+else
+{
+snprintf(fmtBuf, sizeof(fmtBuf), "--%s",
+opt->o_long);
+}
+*lineWidth += strlen(fmtBuf);
+}
+else
+fmtBuf[0] = 0;
+if (doPrint)
+{
+padWidth = hasLongOpt ? maxLineWidth - *lineWidth : 0;
+*lineWidth += padWidth;
+fputs(fmtBuf, fh);
+dmPrintPad(fh, padWidth, ' ');
+dmPrintWrap(fh, opt->desc, *lineWidth, *lineWidth, 79);
 }
 }
 /**
 * @param fh stdio file handle to output to
 * @param opts options list array
 * @param nopts number of elements in options list array
 * @param flags flags (currently unused)
 */
-void dmArgsPrintHelp(FILE *fh,
+void dmArgsPrintHelp(FILE *fh, const DMOptArg *opts,
-const DMOptArg *opts, const int nopts,
+const int nopts, const int flags)
-const int flags)
+{
-{
+int index, maxLineWidth;
-int index;
 (void) flags;
-// Print out option list
+// Determine width of the options and arguments
+maxLineWidth = 0;
 for (index = 0; index < nopts; index++)
 {
-const DMOptArg *opt = &opts[index];
+int lineWidth = 0;
-char tmpStr[128];
+dmArgsPrintHelpPrintItem(NULL, &opts[index], &lineWidth, 0, FALSE);
+if (lineWidth > maxLineWidth)
-// Print short option
+maxLineWidth = lineWidth;
-if (opt->o_short != 0)
+}
-{
-snprintf(tmpStr, sizeof(tmpStr),
+maxLineWidth += 2;
-"-%c,", opt->o_short);
-}
+// Print out the formatted option list
-else
+for (index = 0; index < nopts; index++)
-tmpStr[0] = 0;
+{
+int lineWidth;
-fprintf(fh, " %-5s", tmpStr);
+dmArgsPrintHelpPrintItem(fh, &opts[index], &lineWidth, maxLineWidth, TRUE);
+}
-// Print long option
+}
-if (opt->o_long != NULL)
-{
-snprintf(tmpStr, sizeof(tmpStr), "--%s%s",
-opt->o_long,
-(opt->flags & OPT_ARGREQ) ? "=ARG" : "");
-}
-else
-tmpStr[0] = 0;
-fprintf(fh, "%-18s", tmpStr);
-dmPrintWrap(fh, opt->desc, 24, 24, 79);
-}
-}

Mercurial > hg > dmlib

comparison src/dmargs.c @ 2400:01c6a5261962