git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RHEL 5: Skip 'scrub' test if command is not in the initramfs.
[libguestfs.git]
/
daemon
/
ls.c
diff --git
a/daemon/ls.c
b/daemon/ls.c
index
05e2cc7
..
a440080
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,12
+70,12
@@
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;
char *out, *err;
{
int r, len;
char *out, *err;