X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fstubs.c;h=f992bdf6c44f493e03e8e36df45de63aae6db96d;hp=cafadbea1007436a2edd7a4d4fe7ae8c625a2664;hb=8c3b820c2b687345448e3d74a7101b07ff32688e;hpb=b03ee3675bed8d739ae722ed8c030ae02b3cb0ed

diff --git a/daemon/stubs.c b/daemon/stubs.c
index cafadbe..f992bdf 100644
--- a/daemon/stubs.c
+++ b/daemon/stubs.c
@@ -940,9 +940,14 @@ static void vgcreate_stub (XDR *xdr_in)
     return;
   }
   volgroup = args.volgroup;
-  args.physvols.physvols_val = realloc (args.physvols.physvols_val, sizeof (char *) * (args.physvols.physvols_len+1));
-  args.physvols.physvols_val[args.physvols.physvols_len] = NULL;
-  physvols = args.physvols.physvols_val;
+  physvols = realloc (args.physvols.physvols_val,
+                sizeof (char *) * (args.physvols.physvols_len+1));
+  if (physvols == NULL) {
+    reply_with_perror ("realloc");
+    goto done;
+  }
+  physvols[args.physvols.physvols_len] = NULL;
+  args.physvols.physvols_val = physvols;
 
   r = do_vgcreate (volgroup, physvols);
   if (r == -1)
@@ -1028,9 +1033,14 @@ static void sfdisk_stub (XDR *xdr_in)
   cyls = args.cyls;
   heads = args.heads;
   sectors = args.sectors;
-  args.lines.lines_val = realloc (args.lines.lines_val, sizeof (char *) * (args.lines.lines_len+1));
-  args.lines.lines_val[args.lines.lines_len] = NULL;
-  lines = args.lines.lines_val;
+  lines = realloc (args.lines.lines_val,
+                sizeof (char *) * (args.lines.lines_len+1));
+  if (lines == NULL) {
+    reply_with_perror ("realloc");
+    goto done;
+  }
+  lines[args.lines.lines_len] = NULL;
+  args.lines.lines_val = lines;
 
   r = do_sfdisk (device, cyls, heads, sectors, lines);
   if (r == -1)
@@ -1176,9 +1186,14 @@ static void command_stub (XDR *xdr_in)
     reply_with_error ("%s: daemon failed to decode procedure arguments", "command");
     return;
   }
-  args.arguments.arguments_val = realloc (args.arguments.arguments_val, sizeof (char *) * (args.arguments.arguments_len+1));
-  args.arguments.arguments_val[args.arguments.arguments_len] = NULL;
-  arguments = args.arguments.arguments_val;
+  arguments = realloc (args.arguments.arguments_val,
+                sizeof (char *) * (args.arguments.arguments_len+1));
+  if (arguments == NULL) {
+    reply_with_perror ("realloc");
+    goto done;
+  }
+  arguments[args.arguments.arguments_len] = NULL;
+  args.arguments.arguments_val = arguments;
 
   r = do_command (arguments);
   if (r == NULL)
@@ -1205,9 +1220,14 @@ static void command_lines_stub (XDR *xdr_in)
     reply_with_error ("%s: daemon failed to decode procedure arguments", "command_lines");
     return;
   }
-  args.arguments.arguments_val = realloc (args.arguments.arguments_val, sizeof (char *) * (args.arguments.arguments_len+1));
-  args.arguments.arguments_val[args.arguments.arguments_len] = NULL;
-  arguments = args.arguments.arguments_val;
+  arguments = realloc (args.arguments.arguments_val,
+                sizeof (char *) * (args.arguments.arguments_len+1));
+  if (arguments == NULL) {
+    reply_with_perror ("realloc");
+    goto done;
+  }
+  arguments[args.arguments.arguments_len] = NULL;
+  args.arguments.arguments_val = arguments;
 
   r = do_command_lines (arguments);
   if (r == NULL)
@@ -1855,9 +1875,14 @@ static void debug_stub (XDR *xdr_in)
     return;
   }
   subcmd = args.subcmd;
-  args.extraargs.extraargs_val = realloc (args.extraargs.extraargs_val, sizeof (char *) * (args.extraargs.extraargs_len+1));
-  args.extraargs.extraargs_val[args.extraargs.extraargs_len] = NULL;
-  extraargs = args.extraargs.extraargs_val;
+  extraargs = realloc (args.extraargs.extraargs_val,
+                sizeof (char *) * (args.extraargs.extraargs_len+1));
+  if (extraargs == NULL) {
+    reply_with_perror ("realloc");
+    goto done;
+  }
+  extraargs[args.extraargs.extraargs_len] = NULL;
+  args.extraargs.extraargs_val = extraargs;
 
   r = do_debug (subcmd, extraargs);
   if (r == NULL)
@@ -2050,6 +2075,215 @@ done:
   xdr_free ((xdrproc_t) xdr_guestfs_get_e2uuid_args, (char *) &args);
 }
 
+static void fsck_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_fsck_args args;
+  const char *fstype;
+  const char *device;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_fsck_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "fsck");
+    return;
+  }
+  fstype = args.fstype;
+  device = args.device;
+
+  r = do_fsck (fstype, device);
+  if (r == -1)
+    /* do_fsck has already called reply_with_error */
+    goto done;
+
+  struct guestfs_fsck_ret ret;
+  ret.status = r;
+  reply ((xdrproc_t) &xdr_guestfs_fsck_ret, (char *) &ret);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_fsck_args, (char *) &args);
+}
+
+static void zero_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_zero_args args;
+  const char *device;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_zero_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "zero");
+    return;
+  }
+  device = args.device;
+
+  r = do_zero (device);
+  if (r == -1)
+    /* do_zero has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_zero_args, (char *) &args);
+}
+
+static void grub_install_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_grub_install_args args;
+  const char *root;
+  const char *device;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_grub_install_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "grub_install");
+    return;
+  }
+  root = args.root;
+  device = args.device;
+
+  r = do_grub_install (root, device);
+  if (r == -1)
+    /* do_grub_install has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_grub_install_args, (char *) &args);
+}
+
+static void cp_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_cp_args args;
+  const char *src;
+  const char *dest;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_cp_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "cp");
+    return;
+  }
+  src = args.src;
+  dest = args.dest;
+
+  r = do_cp (src, dest);
+  if (r == -1)
+    /* do_cp has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_cp_args, (char *) &args);
+}
+
+static void cp_a_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_cp_a_args args;
+  const char *src;
+  const char *dest;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_cp_a_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "cp_a");
+    return;
+  }
+  src = args.src;
+  dest = args.dest;
+
+  r = do_cp_a (src, dest);
+  if (r == -1)
+    /* do_cp_a has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_cp_a_args, (char *) &args);
+}
+
+static void mv_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_mv_args args;
+  const char *src;
+  const char *dest;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_mv_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "mv");
+    return;
+  }
+  src = args.src;
+  dest = args.dest;
+
+  r = do_mv (src, dest);
+  if (r == -1)
+    /* do_mv has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_mv_args, (char *) &args);
+}
+
+static void drop_caches_stub (XDR *xdr_in)
+{
+  int r;
+  struct guestfs_drop_caches_args args;
+  int whattodrop;
+
+  memset (&args, 0, sizeof args);
+
+  if (!xdr_guestfs_drop_caches_args (xdr_in, &args)) {
+    reply_with_error ("%s: daemon failed to decode procedure arguments", "drop_caches");
+    return;
+  }
+  whattodrop = args.whattodrop;
+
+  r = do_drop_caches (whattodrop);
+  if (r == -1)
+    /* do_drop_caches has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done:
+  xdr_free ((xdrproc_t) xdr_guestfs_drop_caches_args, (char *) &args);
+}
+
+static void dmesg_stub (XDR *xdr_in)
+{
+  char *r;
+
+  r = do_dmesg ();
+  if (r == NULL)
+    /* do_dmesg has already called reply_with_error */
+    goto done;
+
+  struct guestfs_dmesg_ret ret;
+  ret.kmsgs = r;
+  reply ((xdrproc_t) &xdr_guestfs_dmesg_ret, (char *) &ret);
+  free (r);
+done: ;
+}
+
+static void ping_daemon_stub (XDR *xdr_in)
+{
+  int r;
+
+  r = do_ping_daemon ();
+  if (r == -1)
+    /* do_ping_daemon has already called reply_with_error */
+    goto done;
+
+  reply (NULL, NULL);
+done: ;
+}
+
 void dispatch_incoming_message (XDR *xdr_in)
 {
   switch (proc_nr) {
@@ -2302,6 +2536,33 @@ void dispatch_incoming_message (XDR *xdr_in)
     case GUESTFS_PROC_GET_E2UUID:
       get_e2uuid_stub (xdr_in);
       break;
+    case GUESTFS_PROC_FSCK:
+      fsck_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_ZERO:
+      zero_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_GRUB_INSTALL:
+      grub_install_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_CP:
+      cp_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_CP_A:
+      cp_a_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_MV:
+      mv_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_DROP_CACHES:
+      drop_caches_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_DMESG:
+      dmesg_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_PING_DAEMON:
+      ping_daemon_stub (xdr_in);
+      break;
     default:
       reply_with_error ("dispatch_incoming_message: unknown procedure number %d", proc_nr);
   }