Added "--" to tell the parser to stop reading keys

Author: slayers-git

argparse.c

@@ -22,7 +22,7 @@
  * IN char *** argv: array pointer
  *
  * RETURN: return code */
-static arg_return arg_parse_value (int * argc, char *** argv, void ** data, size_t * size) {
+static ARG_INLINE arg_return arg_parse_value (int * argc, char *** argv, void ** data, size_t * size) {
 	if (!(***argv)) {
 		if (*argc == 1)
 			return ARG_NVALUE;
@@ -64,18 +64,13 @@ static ARG_INLINE arg_return arg_parse_call_handler (int * argc, char *** argv,
 	return ARG_SUCCESS;
 }
 
-/* The author is very lazy and, apparentely, also has very doubtful
- * knowledge of C, so, to avoid using all these fancy things like
- * __thread, he came up with the stupidest idea ever: "why don't I
- * pass the state of the parser to every single function?" */
-
 /* Sub to parse long arguments 
  *   IN size_t * argc: -
  *   IN char *** argv: pointer to the array
  *   IN arg_list list: the list to parse from
  *   
  *   RETURN: Parse code */
-static arg_return arg_parse_long (int * argc, char *** argv, arg_list list, size_t len) {
+static ARG_INLINE arg_return arg_parse_long (int * argc, char *** argv, arg_list list, size_t len) {
 	size_t i;
 	for (i = 0; i < len; ++i) {
 		if (ARG_STREQ(list[i].long_arg, &(**argv))) {
@@ -92,7 +87,7 @@ static arg_return arg_parse_long (int * argc, char *** argv, arg_list list, size
  *   IN arg_list list: the list to parse from
  *   
  *   RETURN: Parse code */
-static arg_return arg_parse_short (int * argc, char *** argv, arg_list list, size_t len) {
+static ARG_INLINE arg_return arg_parse_short (int * argc, char *** argv, arg_list list, size_t len) {
 
 	arg_return code;
 	size_t i;
@@ -146,13 +141,21 @@ char ** arg_parse (int argc, char ** argv, arg_list list, char ** not_keys, size
 	++argv;
 	arg_return ret_code = 0;
 
+	char accept_args = 1;
+
 	while (--argc) {
-		if (**argv == '-') {
+		if (**argv == '-' && accept_args) {
 			if (*(*argv) == 0x0) {
 				*code = ARG_UNEXP;
 				return argv;
 			}
-			if (*(++*argv) == '-' && **argv) { /* If the "--" is passed we have to stop accepting the arguments */ 
+			if (*(++*argv) == '-') { /* If the "--" is passed we have to stop accepting the arguments */ 
+
+				if (**argv == '-' && !*(*argv + 1)) {
+					accept_args = 0;
+					++argv;
+					continue;
+				}
 				++(*argv);
 				if ((ret_code = arg_parse_long (&argc, &argv, list, list_len)) != 0) {
 					*code = ret_code;

argparse.h

@@ -19,16 +19,15 @@
  * 	check whether or not the argument belongs in line
  * 	check if its long or short type
  * 	parse accordingly:
- * 		short, meaning that the data can be inserted after the argument key or after a space 
- * 		long, meaning that the data can be inserted after a space or after a '=' char
- * 	The ordering plays some role */
+ * 		short, meaning that the data can be inserted after a whitespace
+ * 		long, meaning that the data can be inserted after a space char 
+ *
+ * 	flags can be merged together, if they are flags (i.e: tar -xzvf ...) */
 
 
 #ifndef __SL_ARGPARSE_H__
 #define __SL_ARGPARSE_H__
 
-#include <malloc.h>
-
 /* A simple implementation of some important "string.h" functions */
 #ifdef ARG_STANDALONE
 #	define ARG_ASSERT(x)
@@ -58,7 +57,6 @@ static void * arg_memcpy (void * dest, void * src, size_t n) {
 	return dest;
 }
 
-
 #else
 #	include <string.h>
 #	include <assert.h>
@@ -84,9 +82,8 @@ static void * arg_memcpy (void * dest, void * src, size_t n) {
 #define ARG_NMATCH -6
 #define ARG_NVALUE -7
 
-#define ARG_ORDER 0x0001
-
-
+/* If you want to make this work, you have to recompile the library
+ * with -DARG_TRUE_EQ_ONE (makes successful returns equal to 1) */
 #ifndef ARG_TRUE_EQ_ONE
 #	define ARG_SUCCESS 0
 #else
@@ -95,11 +92,11 @@ static void * arg_memcpy (void * dest, void * src, size_t n) {
 
 #define ARG_STREQ(a, b) (arg_strcmp(a, b) == 0)
 
-/* A slightly altered strcmp(), will return 0 even if the strings
- * don't match after the first one ended (i.e: abc = abcde, but
- * abc != abdc)
+/* A slightly altered strcmp(), will move the pointer of the second
+ * string, but will restore it to the former state, if strings don't
+ * match
  *   IN char * f: first string
- *   IN char * f: second string
+ *   IN char ** f: second string
  *
  *   RETURN int:
  *     non-zero, if the strings don't match */
@@ -118,7 +115,6 @@ static int arg_strcmp (char * f, char ** s) {
 	return diff;
 }
 
-typedef int arg_callback ();
 typedef int p_arg_handler (void * data_ptr, size_t blksize, void * retval);
 
 /* The handler is the parser for the value of the argument
@@ -129,10 +125,6 @@ typedef p_arg_handler * arg_handler;
 
 /* A handler for a generic string. */
 static p_arg_handler arg_string_handler;
-/* A handler for a raw data, meaning that the raw byte
- * data will be stored inside a pointer. Acts almost the
- * same way as the arg_string_handler does. */
-static p_arg_handler arg_raw_handler;
 
 static int arg_string_handler (void * data_ptr, size_t blksize, void * retval) {
 	if (blksize == 0) {
@@ -143,19 +135,10 @@ static int arg_string_handler (void * data_ptr, size_t blksize, void * retval) {
 	return 0;
 }
 
-static int arg_raw_handler (void * data_ptr, size_t blksize, void * retval) {
-	if (blksize == 0) {
-		retval = NULL;
-		return 0;
-	}
-	ARG_MEMCPY(retval, data_ptr, blksize);
-	return 0;
-}
-
 /* Flags define the behaviour of the arguments parser 
  * As example, ARG_FLAG_HALT will cause parser to be stopped when 
  * the specified argument is met. */
-typedef unsigned char arg_flags;
+typedef unsigned char arg_flags; /* NOT IMPLEMENTED YET */
 
 /* Type for the return codes */
 typedef signed char arg_return;
@@ -197,7 +180,7 @@ typedef struct arg_argument arg_list[];
  *
  *   NOTE:
  *     this function changes the addresses of the pointers, to save them
- *     as they were, consider writing them into another set of variables.*/
+ *     as they were, consider writing them into another set of variables. */
 char ** arg_parse (int argc, char ** argv, arg_list list, char ** not_keys, size_t * not_keys_size, arg_return * return_code);
 
 #endif