X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..4829d096feb337a55e2b866adb19acab9617b071:/sbr/getarguments.c

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index 92a668e6..d9e7a8f0 100644
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -5,13 +5,17 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "getarguments.h"
+#include "context_find.h"
+#include "brkstring.h"
+#include "h/utils.h"
 
 char **
 getarguments (char *invo_name, int argc, char **argv, int check_context)
 {
-    char *cp = NULL, **ap = NULL, **bp = NULL, **arguments = NULL;
+    char *cp = NULL, **bp = NULL, **arguments = NULL;
+    char *const *ap = NULL;
     int n = 0;
 
     /*
@@ -22,12 +26,12 @@ getarguments (char *invo_name, int argc, char **argv, int check_context)
 	ap = brkstring (cp, " ", "\n");	/* split string */
 
 	/* Count number of arguments split */
-	bp = ap;
-	while (*bp++)
+	char *const *counter = ap;
+	while (*counter++)
 	    n++;
     }
 
-    arguments = (char **) mh_xmalloc ((argc + n) * sizeof(*arguments));
+    arguments = mh_xmalloc ((argc + n) * sizeof(*arguments));
     bp = arguments;
 
     /* Copy any arguments from profile/context */