daemon: Split out checksum type to program name mapping into function.

[libguestfs.git] / daemon / checksum.c

diff --git a/daemon/checksum.c b/daemon/checksum.c
index bdbef13..4ee6231 100644 (file)
--- a/daemon/checksum.c
+++ b/daemon/checksum.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,47 +27,42 @@
 #include "daemon.h"
 #include "actions.h"
 
-char *
-do_checksum (const char *csumtype, const char *path)
+static const char *
+program_of_csum (const char *csumtype)
 {
-  const char *program;
-  char *buf;
-  char *out, *err;
-  int r, len;
-
-  NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
-
-  if (strcasecmp (csumtype, "crc") == 0)
-    program = "cksum";
-  else if (strcasecmp (csumtype, "md5") == 0)
-    program = "md5sum";
-  else if (strcasecmp (csumtype, "sha1") == 0)
-    program = "sha1sum";
-  else if (strcasecmp (csumtype, "sha224") == 0)
-    program = "sha224sum";
-  else if (strcasecmp (csumtype, "sha256") == 0)
-    program = "sha256sum";
-  else if (strcasecmp (csumtype, "sha384") == 0)
-    program = "sha384sum";
-  else if (strcasecmp (csumtype, "sha512") == 0)
-    program = "sha512sum";
+  if (STRCASEEQ (csumtype, "crc"))
+    return "cksum";
+  else if (STRCASEEQ (csumtype, "md5"))
+    return "md5sum";
+  else if (STRCASEEQ (csumtype, "sha1"))
+    return "sha1sum";
+  else if (STRCASEEQ (csumtype, "sha224"))
+    return "sha224sum";
+  else if (STRCASEEQ (csumtype, "sha256"))
+    return "sha256sum";
+  else if (STRCASEEQ (csumtype, "sha384"))
+    return "sha384sum";
+  else if (STRCASEEQ (csumtype, "sha512"))
+    return "sha512sum";
   else {
     reply_with_error ("unknown checksum type, expecting crc|md5|sha1|sha224|sha256|sha384|sha512");
     return NULL;
   }
+}
 
-  /* Make the path relative to /sysroot. */
-  len = strlen (path) + 9;
-  buf = malloc (len);
-  if (!buf) {
-    reply_with_perror ("malloc");
+static char *
+checksum (const char *csumtype, const char *path)
+{
+  const char *program;
+  char *out, *err;
+  int r;
+  int len;
+
+  program = program_of_csum (csumtype);
+  if (program == NULL)
     return NULL;
-  }
-  snprintf (buf, len, "/sysroot%s", path);
 
-  r = command (&out, &err, program, buf, NULL);
-  free (buf);
+  r = command (&out, &err, program, path, NULL);
   if (r == -1) {
     reply_with_error ("%s: %s", program, err);
     free (out);
@@ -83,3 +78,24 @@ do_checksum (const char *csumtype, const char *path)
 
   return out;                  /* Caller frees. */
 }
+
+char *
+do_checksum (const char *csumtype, const char *path)
+{
+  /* Make the path relative to /sysroot. */
+  char *buf = sysroot_path (path);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return NULL;
+  }
+
+  char *r = checksum (csumtype, buf);
+  free (buf);
+  return r;
+}
+
+char *
+do_checksum_device (const char *csumtype, const char *device)
+{
+  return checksum (csumtype, device);
+}