Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 79 insertions, 0 deletions

diff --git a/ui/persfilepath_opt.c b/ui/persfilepath_opt.c
new file mode 100644
index 00000000..feaeb74b
--- /dev/null
+++ b/ui/persfilepath_opt.c
@@ -0,0 +1,79 @@
+/* persfilepath_opt.c
+ * Routines to handle command-line options to set paths for directories
+ * containing personal files (configuration, saved captures)
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <wsutil/filesystem.h>
+
+#include "ui/persfilepath_opt.h"
+
+/*
+ * process command line option that affects the paths of the directories
+ * used for personal files (configuration, saved captures)
+ */
+gboolean
+persfilepath_opt(int opt _U_, const char *optstr)
+{
+    gchar *p, *colonp;
+
+    colonp = strchr(optstr, ':');
+    if (colonp == NULL) {
+        return FALSE;
+    }
+
+    p = colonp;
+    *p++ = '\0';
+
+    /*
+    * Skip over any white space (there probably won't be any, but
+    * as we allow it in the preferences file, we might as well
+    * allow it here).
+    */
+    while (g_ascii_isspace(*p))
+        p++;
+    if (*p == '\0') {
+        /*
+         * Put the colon back, so if our caller uses, in an
+         * error message, the string they passed us, the message
+         * looks correct.
+         */
+        *colonp = ':';
+        return FALSE;
+    }
+
+    /* directory should be existing */
+    /* XXX - is this a requirement? */
+    if(test_for_directory(p) != EISDIR) {
+        /*
+         * Put the colon back, so if our caller uses, in an
+         * error message, the string they passed us, the message
+         * looks correct.
+         */
+        *colonp = ':';
+        return FALSE;
+    }
+
+    if (strcmp(optstr,"persconf") == 0) {
+        set_persconffile_dir(p);
+    } else if (strcmp(optstr,"persdata") == 0) {
+        set_persdatafile_dir(p);
+    } else {
+        /* XXX - might need to add the temp file path */
+        return FALSE;
+    }
+    *colonp = ':'; /* put the colon back */
+    return TRUE;
+}