salvage: add initial config helper

src/CMakeLists.txt

@@ -60,7 +60,7 @@ ELSE(ENABLE_INTERNAL_RIP_SAP)
 ENDIF(ENABLE_INTERNAL_RIP_SAP)
 
 add_executable(nwserv nwserv.c net1.c tools.c ${EMUTLI} ${EMUTLI1} ${NWROUTE_0} )
-add_executable(nwconn nwconn.c net1.c tools.c connect.c namspace.c nwvolume.c nwfile.c unxfile.c nwqconn.c nameos2.c namedos.c nwfname.c nwshare.c extpipe.c nwattrib.c trustee.c nwarchive.c nwatalk.c nwxattr.c ${EMUTLI} )
+add_executable(nwconn nwconn.c net1.c tools.c connect.c namspace.c nwvolume.c nwfile.c unxfile.c nwqconn.c nameos2.c namedos.c nwfname.c nwshare.c extpipe.c nwattrib.c trustee.c nwarchive.c nwatalk.c nwxattr.c nwsalvage.c ${EMUTLI} )
 add_executable(ncpserv ncpserv.c net1.c tools.c ${EMUTLI} )
 add_executable(nwclient nwclient.c net1.c tools.c ${EMUTLI} )
 add_executable(nwbind nwbind.c net1.c tools.c nwdbm.c nwcrypt.c unxlog.c sema.c nwqueue.c unxfile.c ${EMUTLI} )

src/nwsalvage.c

@@ -0,0 +1,120 @@
+/* nwsalvage.c - NetWare salvage/recycle backend helpers */
+#include "nwsalvage.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+int nwsalvage_repository_name_valid(const char *name)
+{
+  size_t len;
+
+  if (!name || !*name) {
+    errno = EINVAL;
+    return(0);
+  }
+
+  len = strlen(name);
+  if (len >= NWSALVAGE_REPOSITORY_NAME_MAX) {
+    errno = ENAMETOOLONG;
+    return(0);
+  }
+
+  if (!strcmp(name, ".") || !strcmp(name, "..")) {
+    errno = EINVAL;
+    return(0);
+  }
+
+  if (strchr(name, '/') || strchr(name, '\\') || strchr(name, ':')) {
+    errno = EINVAL;
+    return(0);
+  }
+
+  return(1);
+}
+
+int nwsalvage_config_set_repositories(struct nwsalvage_config *config,
+                                      const char *recycle_repository,
+                                      const char *metadata_repository)
+{
+  if (!config ||
+      !nwsalvage_repository_name_valid(recycle_repository) ||
+      !nwsalvage_repository_name_valid(metadata_repository)) {
+    if (!errno) errno = EINVAL;
+    return(-1);
+  }
+
+  strncpy(config->recycle_repository, recycle_repository,
+          sizeof(config->recycle_repository));
+  config->recycle_repository[sizeof(config->recycle_repository) - 1] = '\0';
+
+  strncpy(config->metadata_repository, metadata_repository,
+          sizeof(config->metadata_repository));
+  config->metadata_repository[sizeof(config->metadata_repository) - 1] = '\0';
+
+  return(0);
+}
+
+int nwsalvage_config_defaults(struct nwsalvage_config *config)
+{
+  if (!config) {
+    errno = EINVAL;
+    return(-1);
+  }
+
+  memset(config, 0, sizeof(*config));
+  config->enabled = NWSALVAGE_DEFAULT_ENABLED;
+  return(nwsalvage_config_set_repositories(config,
+                                           NWSALVAGE_DEFAULT_RECYCLE_NAME,
+                                           NWSALVAGE_DEFAULT_METADATA_NAME));
+}
+
+static int parse_token(const char **cursor, char *out, size_t out_len)
+{
+  const char *p = *cursor;
+  size_t len = 0;
+
+  while (*p && isspace((unsigned char)*p)) p++;
+  if (!*p) {
+    errno = EINVAL;
+    return(-1);
+  }
+
+  while (p[len] && !isspace((unsigned char)p[len])) len++;
+  if (len >= out_len) {
+    errno = ENAMETOOLONG;
+    return(-1);
+  }
+
+  memcpy(out, p, len);
+  out[len] = '\0';
+  *cursor = p + len;
+  return(0);
+}
+
+int nwsalvage_config_parse_repositories(struct nwsalvage_config *config,
+                                        const char *line)
+{
+  const char *p = line;
+  char recycle_repository[NWSALVAGE_REPOSITORY_NAME_MAX];
+  char metadata_repository[NWSALVAGE_REPOSITORY_NAME_MAX];
+
+  if (!config || !line) {
+    errno = EINVAL;
+    return(-1);
+  }
+
+  if (parse_token(&p, recycle_repository, sizeof(recycle_repository)) < 0 ||
+      parse_token(&p, metadata_repository, sizeof(metadata_repository)) < 0)
+    return(-1);
+
+  while (*p && isspace((unsigned char)*p)) p++;
+  if (*p) {
+    errno = EINVAL;
+    return(-1);
+  }
+
+  return(nwsalvage_config_set_repositories(config,
+                                           recycle_repository,
+                                           metadata_repository));
+}