/****************************************************************************
- * Copyright (c) 2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#define USE_LIBTINFO
#include <progs.priv.h>
-MODULE_ID("$Id: tabs.c,v 1.16 2009/10/10 16:15:37 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.20 2011/05/14 22:34:36 tom Exp $")
static void usage(void) GCC_NORETURN;
value += (ch - '0');
} else if (ch == ',') {
result[n] = value + prior;
- if (n > 0 && value <= result[n - 1]) {
+ if (n > 0 && result[n] <= result[n - 1]) {
fprintf(stderr,
- "tab-stops are not in increasing order\n");
+ "tab-stops are not in increasing order: %d %d\n",
+ value, result[n - 1]);
free(result);
result = 0;
break;
/*
* Add the last value, if any.
*/
- result[n++] = value;
+ result[n++] = value + prior;
result[n] = 0;
}
return result;
bool result = FALSE;
if (source != 0) {
- unsigned len = strlen(source);
+ size_t len = strlen(source);
if (len != 0)
result = (source[len - 1] != ',');
} else {
if (copied != 0 && *copied != '\0') {
const char *comma = ",";
- unsigned need = 1 + strlen(copied);
+ size_t need = 1 + strlen(copied);
if (*copied == ',')
comma = "";
int n, ch;
for (n = 0; tab_list[n] != '\0'; ++n) {
ch = UChar(tab_list[n]);
- if (!(isdigit(ch) || ch == ',')) {
+ if (!(isdigit(ch) || ch == ',' || ch == '+')) {
fprintf(stderr,
"%s: unexpected character found '%c'\n",
program, ch);
mar_list = option;
break;
default:
- usage();
+ /* special case of relative stops separated by spaces? */
+ if (option == argv[n] + 1) {
+ tab_list = add_to_tab_list(&append, argv[n]);
+ }
+ break;
}
}
break;
}
}
tab_list = add_to_tab_list(&append, option);
- option += ((int) strlen(option)) - 1;
break;
}
}