s/strdup/xstrdup/ - check memory allocations for failure.

[project/opkg-lede.git] / libopkg / args.c

diff --git a/libopkg/args.c b/libopkg/args.c
index ef2b4960e227e389b69b34dbbb3c1a51bf1c74ed..b7aafcdb6e5753af6a899a3a9d126923e366372b 100644 (file)
--- a/libopkg/args.c
+++ b/libopkg/args.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "args.h"
 #include "sprintf_alloc.h"
+#include "libbb/libbb.h"
 
 static void print_version(void);
 
@@ -62,7 +63,7 @@ int args_init(args_t *args)
      if (conf_file_dir == NULL || conf_file_dir[0] == '\0') {
          conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR;
      }
-     sprintf_alloc(&args->conf_file, "%s/%s", conf_file_dir,
+     sprintf_alloc(&args->conf_file, "%s/%s", OPKGETCDIR,
                   ARGS_DEFAULT_CONF_FILE_NAME);
 
      args->force_defaults = ARGS_DEFAULT_FORCE_DEFAULTS;
@@ -163,23 +164,23 @@ int args_parse(args_t *args, int argc, char *argv[])
               args->query_all = 1;
               break;
          case 'd':
-              args->dest = strdup (optarg);
+              args->dest = xstrdup(optarg);
               break;
          case 'f':
               free(args->conf_file);
-              args->conf_file = strdup(optarg);
+              args->conf_file = xstrdup(optarg);
               break;
          case 'o':
-              args->offline_root = strdup (optarg);
+              args->offline_root = xstrdup(optarg);
               break;
          case 'p':
-              args->offline_root_path = strdup (optarg);
+              args->offline_root_path = xstrdup(optarg);
               break;
          case 'n':
               args->noaction = 1;
               break;
          case 't':
-              args->tmp_dir = strdup(optarg);
+              args->tmp_dir = xstrdup(optarg);
               break;
          case 'v':
               print_version();
@@ -196,7 +197,7 @@ int args_parse(args_t *args, int argc, char *argv[])
               break;
          case ARGS_OPT_CACHE:
               free(args->cache);
-              args->cache = strdup(optarg);
+              args->cache = xstrdup(optarg);
               break;
          case ARGS_OPT_FORCE_DEFAULTS:
               args->force_defaults = 1;