static void usage (void);
/* Also in guestfs.c */
-#define VMCHANNEL_PORT "6666"
-#define VMCHANNEL_ADDR "10.0.2.4"
+#define GUESTFWD_PORT "6666"
+#define GUESTFWD_ADDR "10.0.2.4"
int verbose = 0;
int
main (int argc, char *argv[])
{
- static const char *options = "fh:p:?";
- static struct option long_options[] = {
+ static const char *options = "f?";
+ static const struct option long_options[] = {
{ "foreground", 0, 0, 'f' },
{ "help", 0, 0, '?' },
- { "host", 1, 0, 'h' },
- { "port", 1, 0, 'p' },
{ 0, 0, 0, 0 }
};
int c, n, r;
int dont_fork = 0;
- const char *host = NULL;
- const char *port = NULL;
FILE *fp;
char buf[4096];
char *p, *p2;
dont_fork = 1;
break;
- case 'h':
- host = optarg;
- break;
-
- case 'p':
- port = optarg;
- break;
-
case '?':
usage ();
exit (0);
exit (1);
}
- /* If host and port aren't set yet, try /proc/cmdline. */
- if (!host || !port) {
- fp = fopen ("/proc/cmdline", "r");
- if (fp == NULL) {
- perror ("/proc/cmdline");
- goto next;
- }
- n = fread (buf, 1, sizeof buf - 1, fp);
- fclose (fp);
- buf[n] = '\0';
-
- /* Set the verbose flag. Not quite right because this will only
- * set the flag if host and port aren't set on the command line.
- * Don't worry about this for now. (XXX)
- */
- verbose = strstr (buf, "guestfs_verbose=1") != NULL;
- if (verbose)
- printf ("verbose daemon enabled\n");
-
- p = strstr (buf, "guestfs=");
-
- if (p) {
- p += 8;
- p2 = strchr (p, ':');
- if (p2) {
- *p2++ = '\0';
- host = p;
- r = strcspn (p2, " \n");
- p2[r] = '\0';
- port = p2;
- }
- }
+ /* Set the verbose flag. */
+ fp = fopen ("/proc/cmdline", "r");
+ if (fp == NULL) {
+ perror ("/proc/cmdline");
+ goto next;
}
+ n = fread (buf, 1, sizeof buf - 1, fp);
+ fclose (fp);
+ buf[n] = '\0';
- next:
- /* Can't parse /proc/cmdline, so use built-in defaults. */
- if (!host || !port) {
- host = VMCHANNEL_ADDR;
- port = VMCHANNEL_PORT;
- }
+ verbose = strstr (buf, "guestfs_verbose=1") != NULL;
+ if (verbose)
+ printf ("verbose daemon enabled\n");
+ next:
/* Make sure SIGPIPE doesn't kill us. */
memset (&sa, 0, sizeof sa);
sa.sa_handler = SIG_IGN;
*/
setenv ("PATH", "/usr/bin:/bin", 1);
setenv ("SHELL", "/bin/sh", 1);
- setenv ("LANG", "C", 1);
+ setenv ("LC_ALL", "C", 1);
/* We document that umask defaults to 022 (it should be this anyway). */
umask (022);
memset (&hints, 0, sizeof hints);
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_ADDRCONFIG;
- r = getaddrinfo (host, port, &hints, &res);
+ r = getaddrinfo (GUESTFWD_ADDR, GUESTFWD_PORT, &hints, &res);
if (r != 0) {
- fprintf (stderr, "%s:%s: %s\n", host, port, gai_strerror (r));
+ fprintf (stderr, "%s:%s: %s\n",
+ GUESTFWD_ADDR, GUESTFWD_PORT, gai_strerror (r));
exit (1);
}
sock = socket (rr->ai_family, rr->ai_socktype, rr->ai_protocol);
if (sock != -1) {
if (connect (sock, rr->ai_addr, rr->ai_addrlen) == 0)
- break;
+ break;
perror ("connect");
close (sock);
freeaddrinfo (res);
if (sock == -1) {
- fprintf (stderr, "connection to %s:%s failed\n", host, port);
+ fprintf (stderr, "connection to %s:%s failed\n",
+ GUESTFWD_ADDR, GUESTFWD_PORT);
exit (1);
}
exit (1);
}
- (void) xwrite (sock, buf, xdr_getpos (&xdr));
+ if (xwrite (sock, buf, xdr_getpos (&xdr)) == -1)
+ exit (1);
xdr_destroy (&xdr);
}
int
-xwrite (int sock, const void *buf, size_t len)
+xwrite (int sock, const void *v_buf, size_t len)
{
int r;
+ const char *buf = v_buf;
while (len > 0) {
r = write (sock, buf, len);
}
int
-xread (int sock, void *buf, size_t len)
+xread (int sock, void *v_buf, size_t len)
{
int r;
+ char *buf = v_buf;
while (len > 0) {
r = read (sock, buf, len);
static void
usage (void)
{
- fprintf (stderr, "guestfsd [-f] [-h host -p port]\n");
+ fprintf (stderr, "guestfsd [-f]\n");
}
int
}
int
-count_strings (char * const* const argv)
+count_strings (char *const *argv)
{
int argc;
command (char **stdoutput, char **stderror, const char *name, ...)
{
va_list args;
- char **argv, **p;
+ const char **argv;
char *s;
int i, r;
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);
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);
commandr (char **stdoutput, char **stderror, const char *name, ...)
{
va_list args;
- char **argv, **p;
+ const char **argv;
char *s;
int i, r;
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);
/* 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;
- r = commandrv (stdoutput, stderror, argv);
+ r = commandrv (stdoutput, stderror, (void *) argv);
if (r == 0)
return 0;
else
}
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];
close (so_fd[1]);
close (se_fd[1]);
- execvp (argv[0], argv);
+ execvp (argv[0], (void *) argv);
perror (argv[0]);
_exit (1);
}
if (FD_ISSET (so_fd[0], &rset2)) { /* something on stdout */
r = read (so_fd[0], buf, sizeof buf);
if (r == -1) {
- perror ("read");
- goto quit;
+ perror ("read");
+ goto quit;
}
if (r == 0) { FD_CLR (so_fd[0], &rset); quit++; }
if (r > 0 && stdoutput) {
- so_size += r;
- p = realloc (*stdoutput, so_size);
- if (p == NULL) {
- perror ("realloc");
- goto quit;
- }
- *stdoutput = p;
- memcpy (*stdoutput + so_size - r, buf, r);
+ so_size += r;
+ p = realloc (*stdoutput, so_size);
+ if (p == NULL) {
+ perror ("realloc");
+ goto quit;
+ }
+ *stdoutput = p;
+ memcpy (*stdoutput + so_size - r, buf, r);
}
}
if (FD_ISSET (se_fd[0], &rset2)) { /* something on stderr */
r = read (se_fd[0], buf, sizeof buf);
if (r == -1) {
- perror ("read");
- goto quit;
+ perror ("read");
+ goto quit;
}
if (r == 0) { FD_CLR (se_fd[0], &rset); quit++; }
if (r > 0 && stderror) {
- se_size += r;
- p = realloc (*stderror, se_size);
- if (p == NULL) {
- perror ("realloc");
- goto quit;
- }
- *stderror = p;
- memcpy (*stderror + se_size - r, buf, r);
+ se_size += r;
+ p = realloc (*stderror, se_size);
+ if (p == NULL) {
+ perror ("realloc");
+ goto quit;
+ }
+ *stderror = p;
+ memcpy (*stderror + se_size - r, buf, r);
}
}
}
(*stderror)[se_size] = '\0';
se_size--;
while (se_size >= 0 && (*stderror)[se_size] == '\n')
- (*stderror)[se_size--] = '\0';
+ (*stderror)[se_size--] = '\0';
}
}
*/
static int
print_shell_quote (FILE *stream,
- const struct printf_info *info,
+ const struct printf_info *info ATTRIBUTE_UNUSED,
const void *const *args)
{
#define SAFE(c) (isalnum((c)) || \
- (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.')
+ (c) == '/' || (c) == '-' || (c) == '_' || (c) == '.')
int i, len;
const char *str = *((const char **) (args[0]));
static int
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);
}
#ifdef HAVE_REGISTER_PRINTF_SPECIFIER
static int
-print_arginfo (const struct printf_info *info,
- size_t n, int *argtypes, int *size)
+print_arginfo (const struct printf_info *info ATTRIBUTE_UNUSED,
+ size_t n, int *argtypes, int *size)
{
if (n > 0) {
argtypes[0] = PA_STRING;
#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.
*
git.annexia.org / libguestfs.git / blobdiff