aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-08-18 17:45:03 +0200
committerMattias Andrée <maandree@operamail.com>2013-08-18 17:45:03 +0200
commit8df963da31c82d2f691da67272ff1091a269bede (patch)
treef8ea9e4ba51fd2719525a87a92b549a50560d0d1 /src
parentimplement colour settings for help in bash version (diff)
downloadargparser-8df963da31c82d2f691da67272ff1091a269bede.tar.gz
argparser-8df963da31c82d2f691da67272ff1091a269bede.tar.bz2
argparser-8df963da31c82d2f691da67272ff1091a269bede.tar.xz
some c fixes
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src')
-rw-r--r--src/argparser.c32
-rw-r--r--src/argparser.h6
-rw-r--r--src/test.c4
3 files changed, 25 insertions, 17 deletions
diff --git a/src/argparser.c b/src/argparser.c
index 46b1509..b341136 100644
--- a/src/argparser.c
+++ b/src/argparser.c
@@ -474,7 +474,7 @@ void args_opts_append(char* name, char* value)
else
{
long address = (long)(void*)values;
- values = realloc(values, size);
+ values = (char**)realloc(values, size);
*(values + size - 1) = value;
if ((long)(void*)values != address)
args_opts_put(name, values);
@@ -939,8 +939,10 @@ void args_support_alternatives()
/**
* Prints a colourful help message
+ *
+ * @param [use_colours] `0` for no colours, `1` for colours, and `-1` for if not piped
*/
-void args_help()
+void args_help(long use_colours)
{
long maxfirstlen = 0, count = 0, copts = args_get_options_count();
char* dash = args_linuxvt ? "-" : "—";
@@ -948,6 +950,11 @@ void args_help()
char** lines;
long* lens;
+ if ((use_colours != 0) && (use_colours != 1))
+ {
+ use_colours = 1;
+ }
+
fprintf(args_out, "\033[01m%s\033[21m %s %s\n", args_program, dash, args_description);
if (args_longdescription != null)
fprintf(args_out, "%s\n", args_longdescription);
@@ -1005,7 +1012,7 @@ void args_help()
{
long i;
for (i = 0; i < maxfirstlen; i++)
- *(empty + i++) = ' ';
+ *(empty + i) = ' ';
*(empty + maxfirstlen) = 0;
}
@@ -1029,7 +1036,10 @@ void args_help()
last = *(args_options_get_alternatives(i) + args_options_get_alternatives_count(i) - 1);
type = args_options_get_type(i);
if (first == last)
- first = empty;
+ {
+ first = empty;
+ first_extra = "";
+ }
else
{
n = 0;
@@ -1092,10 +1102,9 @@ void args_help()
empty = (char*)malloc((col + 1) * sizeof(char));
for (i = 0; i < col; i++)
- *(empty + i++) = ' ';
+ *(empty + i) = ' ';
*(empty + col) = 0;
i = 0;
-
for (i = 0; i < copts; i++)
{
long first = true, j = 0, jptr = 0;
@@ -1127,6 +1136,7 @@ void args_help()
}
else
*(buf + j++) = c;
+ *(buf + j) = 0;
for (j = 0; j < jptr; j++)
if (first)
{
@@ -1308,11 +1318,7 @@ long args_parse(int argc, char** argv)
}
}
else
- {
- if (++args_unrecognised_count <= 5)
- fprintf(args_out, "%s: warning: unrecognised option %s\n", args_program, arg);
- rc = false;
- }
+ *(args_files + args_files_count++) = arg;
}
{
@@ -1337,7 +1343,7 @@ long args_parse(int argc, char** argv)
char* std = args_options_get_standard(i);
if (args_opts_contains(std))
{
- if (*(args_opts_get(std)) == null)
+ if (args_opts_get(std) == null)
args_opts_clear(std);
for (j = 0; j < args_files_count; j++)
args_opts_append(std, *(args_files + j));
@@ -1526,7 +1532,7 @@ static void map_put(args_Map* map, char* key, void* value)
at = (void**)*(at + b);
else
{
- at = (void**)(*(at + a) = (void*)malloc(17 * sizeof(void*)));
+ at = (void**)(*(at + b) = (void*)malloc(17 * sizeof(void*)));
for (i = 0; i < 17; i++)
*(at + i) = null;
new = true;
diff --git a/src/argparser.h b/src/argparser.h
index a3df727..82fd3b2 100644
--- a/src/argparser.h
+++ b/src/argparser.h
@@ -170,7 +170,7 @@ long args_files_count;
* @param usestderr Whether to use stderr instead of stdout
* @param alternative Whether to use single dash/plus long options
*/
-extern void args_init(char* description, char* usage, char* longdscription, char* program, long usestderr, long alternative);
+extern void args_init(char* description, char* usage, char* longdescription, char* program, long usestderr, long alternative);
/**
@@ -494,8 +494,10 @@ extern void args_support_alternatives(void);
/**
* Prints a colourful help message
+ *
+ * @param [use_colours] `-1` for no colours, `1` for colours, and `0` for if not piped
*/
-extern void args_help(void);
+extern void args_help();
/**
* Parse arguments
diff --git a/src/test.c b/src/test.c
index 41c9bce..c02c80c 100644
--- a/src/test.c
+++ b/src/test.c
@@ -43,8 +43,8 @@ int main(int argc, char** argv)
"You should have received a copy of the GNU Affero General Public License\n"
"along with this library. If not, see <http://www.gnu.org/licenses/>.", 0, 1, 0);
- args_add_option(args_new_argumentless(0, "-h", "-?", "--help", NULL), "Prints this help message\n(and exits)");
- args_add_option(args_new_argumentless(0, "--hello", NULL), "Prints the text: hello world'");
+ args_add_option(args_new_argumentless(1, "-h", "-?", "--help", NULL), "Prints this help message\n(and exits)");
+ args_add_option(args_new_argumentless(0, "--hello", NULL), "Prints the text: hello world");
args_add_option(args_new_argumentless(0, "++hidden", NULL), 0);
args_add_option(args_new_argumented("LINE", 0, "-l", "--line", NULL), "Prints the choosen line");