git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: remove trailing blanks, enable syntax-check
[libguestfs.git]
/
daemon
/
ls.c
diff --git
a/daemon/ls.c
b/daemon/ls.c
index
05e2cc7
..
4d4714e
100644
(file)
--- a/
daemon/ls.c
+++ b/
daemon/ls.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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
@@
-29,16
+29,8
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
-static int
-compare (const void *vp1, const void *vp2)
-{
- char * const *p1 = (char * const *) vp1;
- char * const *p2 = (char * const *) vp2;
- return strcmp (*p1, *p2);
-}
-
char **
char **
-do_ls (c
onst c
har *path)
+do_ls (char *path)
{
char **r = NULL;
int size = 0, alloc = 0;
{
char **r = NULL;
int size = 0, alloc = 0;
@@
-78,14
+70,14
@@
do_ls (const char *path)
return NULL;
}
return NULL;
}
-
qsort (r, size-1, sizeof (char *), compare
);
+
sort_strings (r, size-1
);
return r;
}
char *
return r;
}
char *
-do_ll (c
onst c
har *path)
+do_ll (char *path)
{
{
- int r
, len
;
+ int r;
char *out, *err;
char *spath;
char *out, *err;
char *spath;
@@
-98,13
+90,11
@@
do_ll (const char *path)
* interactive sessions. For the same reason, you can also "escape"
* the sysroot (eg. 'll /..').
*/
* 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;
}
if (!spath) {
reply_with_perror ("malloc");
return NULL;
}
- snprintf (spath, len, "/sysroot%s", path);
r = command (&out, &err, "ls", "-la", spath, NULL);
free (spath);
r = command (&out, &err, "ls", "-la", spath, NULL);
free (spath);