git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resize: Refactor the code for creating target partitions.
[libguestfs.git]
/
daemon
/
checksum.c
diff --git
a/daemon/checksum.c
b/daemon/checksum.c
index
e12a8a8
..
0bd9623
100644
(file)
--- a/
daemon/checksum.c
+++ b/
daemon/checksum.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009
-2011
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
*
* 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
@@
-25,7
+25,7
@@
#include <fcntl.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
@@
-61,12
+61,17
@@
checksum (const char *csumtype, int fd)
int len;
program = program_of_csum (csumtype);
int len;
program = program_of_csum (csumtype);
- if (program == NULL)
+ if (program == NULL) {
+ close (fd);
return NULL;
return NULL;
+ }
+
+ pulse_mode_start ();
flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
r = commandf (&out, &err, flags, program, NULL);
if (r == -1) {
flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
r = commandf (&out, &err, flags, program, NULL);
if (r == -1) {
+ pulse_mode_cancel ();
reply_with_error ("%s: %s", program, err);
free (out);
free (err);
reply_with_error ("%s: %s", program, err);
free (out);
free (err);
@@
-79,6
+84,8
@@
checksum (const char *csumtype, int fd)
len = strcspn (out, " \t\n");
out[len] = '\0';
len = strcspn (out, " \t\n");
out[len] = '\0';
+ pulse_mode_end ();
+
return out; /* Caller frees. */
}
return out; /* Caller frees. */
}