/* 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
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
+#include <dirent.h>
#include <sys/stat.h>
#include "daemon.h"
#include "actions.h"
char **
-do_ls (const char *path)
+do_ls (char *path)
{
- reply_with_error ("ls command is not yet implemented");
- return NULL;
+ char **r = NULL;
+ int size = 0, alloc = 0;
+ DIR *dir;
+ struct dirent *d;
+
+ NEED_ROOT (NULL);
+ ABS_PATH (path, NULL);
+
+ CHROOT_IN;
+ dir = opendir (path);
+ CHROOT_OUT;
+
+ if (!dir) {
+ reply_with_perror ("opendir: %s", path);
+ return NULL;
+ }
+
+ while ((d = readdir (dir)) != NULL) {
+ if (strcmp (d->d_name, ".") == 0 || strcmp (d->d_name, "..") == 0)
+ continue;
+
+ if (add_string (&r, &size, &alloc, d->d_name) == -1) {
+ closedir (dir);
+ return NULL;
+ }
+ }
+
+ if (add_string (&r, &size, &alloc, NULL) == -1) {
+ closedir (dir);
+ return NULL;
+ }
+
+ if (closedir (dir) == -1) {
+ reply_with_perror ("closedir: %s", path);
+ free_strings (r);
+ return NULL;
+ }
+
+ sort_strings (r, size-1);
+ return r;
}
char *
-do_ll (const char *path)
+do_ll (char *path)
{
- int r, len;
+ int r;
char *out, *err;
char *spath;
- if (path[0] != '/') {
- reply_with_error ("ll: path must start with a / character");
- return NULL;
- }
+ //NEED_ROOT
+ ABS_PATH (path, NULL);
/* This exposes the /sysroot, because we can't chroot and run the ls
* command (since 'ls' won't necessarily exist in the chroot). This
* interactive sessions. For the same reason, you can also "escape"
* the sysroot (eg. 'll /..').
*/
- len = strlen (path) + 9;
- spath = malloc (len);
+ spath = sysroot_path (path);
if (!spath) {
reply_with_perror ("malloc");
return NULL;
}
- snprintf (spath, len, "/sysroot%s", path);
r = command (&out, &err, "ls", "-la", spath, NULL);
free (spath);