Add my_strndup() api

Provide an implementation of strndup that only requires malloc

diff --git a/src/dumb/dumb_frotz.h b/src/dumb/dumb_frotz.h
index 0be1177e66e67670b7fdfdc7489dffafcaf5b1fc..89fa887015e0528f035870ddb73596e1c87515ea 100644 (file)
--- a/src/dumb/dumb_frotz.h
+++ b/src/dumb/dumb_frotz.h
@@ -17,6 +17,7 @@
 #include <time.h>
 
 extern char *my_strdup(char *);
+extern char *my_strndup(char *, size_t);
 
 /* from ../common/setup.h */
 extern f_setup_t f_setup;

diff --git a/src/dumb/dumb_init.c b/src/dumb/dumb_init.c
index d154107f2ffa22adfdc0bd1030f30f9b6c66508f..9b8f74f03455832c06ce7e7ffc7ea93f74cebd71 100644 (file)
--- a/src/dumb/dumb_init.c
+++ b/src/dumb/dumb_init.c
@@ -116,7 +116,7 @@ void os_process_arguments(int argc, char *argv[])
          case 'P': f_setup.piracy = 1; break;
        case 'p': plain_ascii = 1; break;
        case 'r': dumb_handle_setting(zoptarg, FALSE, TRUE); break;
-       case 'R': f_setup.restricted_path = strndup(zoptarg, PATH_MAX); break;
+       case 'R': f_setup.restricted_path =  my_strndup(zoptarg, PATH_MAX); break;
        case 's': user_random_seed = atoi(zoptarg); break;
          case 'S': f_setup.script_cols = atoi(zoptarg); break;
        case 't': user_tandy_bit = 1; break;
@@ -304,6 +304,24 @@ char *my_strdup(char *src)
        return str;
 }
 
+char *my_strndup(char *src, size_t n)
+{
+       char *str;
+       char *p;
+       int len = 0;
+
+       while (src[len] && len < n)
+               len++;
+       str = malloc(len + 1);
+       p = str;
+       while (len--)
+       {
+               *p++ = *src++;
+       }
+       *p = '\0';
+       return str;
+}
+
 static void print_version(void)
 {
     printf("FROTZ V%s\t", GIT_TAG);