Added the long arguments

Fixed all of the previous issues, added the implementation for the long arguments

Author: slayers-git

argparse.c

@@ -76,12 +76,12 @@ static ARG_INLINE arg_return arg_parse_call_handler (int * argc, char *** argv,
 static 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)) {
-			
-			arg_parse_call_handler (argc, argv, &list[i]);
+		if (ARG_STREQ(list[i].long_arg, &(**argv))) {
+
+			return arg_parse_call_handler (argc, argv, &list[i]);
 		}
 	}
-	return ARG_SUCCESS;	
+	return ARG_NMATCH;
 }
 
 /* Sub to parse short arguments 
@@ -154,23 +154,24 @@ char ** arg_parse (int argc, char ** argv, arg_list list, arg_return * code) {
 	arg_return ret_code = 0;
 	while (--argc) {
 		if (**argv == '-') {
+			if (*(*argv) == 0x0) {
+				*code = ARG_UNEXP;
+				return argv;
+			}
 			if (*(++*argv) == '-' && **argv) { /* If the "--" is passed we have to stop accepting the arguments */ 
+				++(*argv);
 				if ((ret_code = arg_parse_long (&argc, &argv, list, list_len)) != 0) {
 					*code = ret_code;
 					return argv;
 				}
-			}
 
-			if (*(*argv) == 0x0) {
-				*code = ARG_UNEXP;
-				return argv;
+				continue;
 			}
+
 			if ((ret_code = arg_parse_short_a (&argc, &argv, list, list_len)) != 0) {
 				*code = ret_code;
 				return argv;
-			}
-			if (argc != 1)
-				++argv;
+			} else continue;
 
 			/* Not a key */
 			arg_parse_non (&argc, &argv, list, list_len);

argparse.h

@@ -32,7 +32,6 @@
 /* A simple implementation of some important "string.h" functions */
 #ifdef ARG_STANDALONE
 #	define ARG_ASSERT(x)
-#	define ARG_STRCMP(a, b) arg_strcmp(a, b)
 #	define ARG_STRLEN(str) arg_strlen(str)
 #	define ARG_STRCPY(dest, src) arg_strcpy(dest, src)
 #	define ARG_MEMCPY(dest, src, n) arg_memcpy(dest, src, n)
@@ -59,28 +58,11 @@ static void * arg_memcpy (void * dest, void * src, size_t n) {
 	return dest;
 }
 
-/* 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)
- *   IN char * f: first string
- *   IN char * f: second string
- *
- *   RETURN int:
- *     non-zero, if the strings don't match */
-static int arg_strcmp (char * f, char * s) {
-	while (*f && *s) {
-		if (!(*f == *s))
-			break;
-		++f; ++s;
-	}
-	return *(unsigned char *)f - *(unsigned char *)s;
-}
 
 #else
 #	include <string.h>
 #	include <assert.h>
 #	define ARG_ASSERT(x) assert(x)
-#	define ARG_STRCMP(a, b) strcmp(a, b)
 #	define ARG_STRLEN(str) strlen(str)
 #	define ARG_STRCPY(dest, src) strcpy(dest, src)
 #	define ARG_MEMCPY(dest, src, n) memcpy(dest, src, n)
@@ -111,7 +93,30 @@ static int arg_strcmp (char * f, char * s) {
 #	define ARG_SUCCESS 1
 #endif
 
-#define ARG_STREQ(a, b) (ARG_STRCMP(a, b) == 0)
+#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)
+ *   IN char * f: first string
+ *   IN char * f: second string
+ *
+ *   RETURN int:
+ *     non-zero, if the strings don't match */
+static int arg_strcmp (char * f, char ** s) {
+	char * rest_ptr = *s;
+	while (*f && **s) {
+		if (!(*f == **s)) {
+			break;	
+		}
+		++f; ++(*s);
+	}
+	int diff;
+	if ((diff = *(unsigned char *)f - *(unsigned char *)*s) != 0)
+		*s = rest_ptr;
+
+	return diff;
+}
 
 typedef int arg_callback ();
 typedef int p_arg_handler (void * data_ptr, size_t blksize, void * retval);