git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove main loop.
[libguestfs.git]
/
daemon
/
guestfsd.c
diff --git
a/daemon/guestfsd.c
b/daemon/guestfsd.c
index
07a952f
..
af554bf
100644
(file)
--- a/
daemon/guestfsd.c
+++ b/
daemon/guestfsd.c
@@
-188,7
+188,7
@@
main (int argc, char *argv[])
*/
setenv ("PATH", "/usr/bin:/bin", 1);
setenv ("SHELL", "/bin/sh", 1);
*/
setenv ("PATH", "/usr/bin:/bin", 1);
setenv ("SHELL", "/bin/sh", 1);
- setenv ("L
ANG
", "C", 1);
+ setenv ("L
C_ALL
", "C", 1);
/* We document that umask defaults to 022 (it should be this anyway). */
umask (022);
/* We document that umask defaults to 022 (it should be this anyway). */
umask (022);
@@
-273,9
+273,10
@@
sysroot_path (const char *path)
}
int
}
int
-xwrite (int sock, const void *buf, size_t len)
+xwrite (int sock, const void *
v_
buf, size_t len)
{
int r;
{
int r;
+ const char *buf = v_buf;
while (len > 0) {
r = write (sock, buf, len);
while (len > 0) {
r = write (sock, buf, len);
@@
-291,9
+292,10
@@
xwrite (int sock, const void *buf, size_t len)
}
int
}
int
-xread (int sock, void *buf, size_t len)
+xread (int sock, void *
v_
buf, size_t len)
{
int r;
{
int r;
+ char *buf = v_buf;
while (len > 0) {
r = read (sock, buf, len);
while (len > 0) {
r = read (sock, buf, len);
@@
-351,7
+353,7
@@
add_string (char ***argv, int *size, int *alloc, const char *str)
}
int
}
int
-count_strings (char *
const* const
argv)
+count_strings (char *
const *
argv)
{
int argc;
{
int argc;
@@
-403,7
+405,7
@@
int
command (char **stdoutput, char **stderror, const char *name, ...)
{
va_list args;
command (char **stdoutput, char **stderror, const char *name, ...)
{
va_list args;
- c
har **argv, **p
;
+ c
onst char **argv
;
char *s;
int i, r;
char *s;
int i, r;
@@
-420,7
+422,7
@@
command (char **stdoutput, char **stderror, const char *name, ...)
va_start (args, name);
while ((s = va_arg (args, char *)) != NULL) {
va_start (args, name);
while ((s = va_arg (args, char *)) != NULL) {
- p = realloc (argv, sizeof (char *) * (++i));
+
const char **
p = realloc (argv, sizeof (char *) * (++i));
if (p == NULL) {
perror ("realloc");
free (argv);
if (p == NULL) {
perror ("realloc");
free (argv);
@@
-434,7
+436,7
@@
command (char **stdoutput, char **stderror, const char *name, ...)
va_end (args);
va_end (args);
- r = commandv (stdoutput, stderror, argv);
+ r = commandv (stdoutput, stderror,
(char **)
argv);
/* NB: Mustn't free the strings which are on the stack. */
free (argv);
/* NB: Mustn't free the strings which are on the stack. */
free (argv);
@@
-450,7
+452,7
@@
int
commandr (char **stdoutput, char **stderror, const char *name, ...)
{
va_list args;
commandr (char **stdoutput, char **stderror, const char *name, ...)
{
va_list args;
- c
har **argv, **p
;
+ c
onst char **argv
;
char *s;
int i, r;
char *s;
int i, r;
@@
-467,7
+469,7
@@
commandr (char **stdoutput, char **stderror, const char *name, ...)
va_start (args, name);
while ((s = va_arg (args, char *)) != NULL) {
va_start (args, name);
while ((s = va_arg (args, char *)) != NULL) {
- p = realloc (argv, sizeof (char *) * (++i));
+
const char **
p = realloc (argv, sizeof (char *) * (++i));
if (p == NULL) {
perror ("realloc");
free (argv);
if (p == NULL) {
perror ("realloc");
free (argv);
@@
-491,11
+493,11
@@
commandr (char **stdoutput, char **stderror, const char *name, ...)
/* Same as 'command', but passing an argv. */
int
/* Same as 'command', but passing an argv. */
int
-commandv (char **stdoutput, char **stderror, char *
const* const
argv)
+commandv (char **stdoutput, char **stderror, char *
const *
argv)
{
int r;
{
int r;
- r = commandrv (stdoutput, stderror, argv);
+ r = commandrv (stdoutput, stderror,
(void *)
argv);
if (r == 0)
return 0;
else
if (r == 0)
return 0;
else
@@
-503,7
+505,7
@@
commandv (char **stdoutput, char **stderror, char * const* const argv)
}
int
}
int
-commandrv (char **stdoutput, char **stderror, char
* const* const
argv)
+commandrv (char **stdoutput, char **stderror, char
const* const *
argv)
{
int so_size = 0, se_size = 0;
int so_fd[2], se_fd[2];
{
int so_size = 0, se_size = 0;
int so_fd[2], se_fd[2];
@@
-547,7
+549,7
@@
commandrv (char **stdoutput, char **stderror, char * const* const argv)
close (so_fd[1]);
close (se_fd[1]);
close (so_fd[1]);
close (se_fd[1]);
- execvp (argv[0], argv);
+ execvp (argv[0],
(void *)
argv);
perror (argv[0]);
_exit (1);
}
perror (argv[0]);
_exit (1);
}
@@
-743,8
+745,6
@@
print_sysroot_shell_quote (FILE *stream,
const struct printf_info *info,
const void *const *args)
{
const struct printf_info *info,
const void *const *args)
{
-#define SAFE(c) (isalnum((c)) || \
- (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.')
fputs (sysroot, stream);
return sysroot_len + print_shell_quote (stream, info, args);
}
fputs (sysroot, stream);
return sysroot_len + print_shell_quote (stream, info, args);
}
@@
-775,7
+775,7
@@
print_arginfo (const struct printf_info *info, size_t n, int *argtypes)
#endif
/* Perform device name translation. Don't call this directly -
#endif
/* Perform device name translation. Don't call this directly -
- * use the
IS
_DEVICE macro.
+ * use the
RESOLVE
_DEVICE macro.
*
* See guestfs(3) for the algorithm.
*
*
* See guestfs(3) for the algorithm.
*