git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7cf4779
)
Fix compilation if readline library is not present.
author
Richard Jones
<rjones@redhat.com>
Tue, 10 Nov 2009 12:34:27 +0000
(12:34 +0000)
committer
Richard Jones
<rjones@redhat.com>
Tue, 10 Nov 2009 16:32:20 +0000
(16:32 +0000)
fish/destpaths.c
patch
|
blob
|
history
diff --git
a/fish/destpaths.c
b/fish/destpaths.c
index
c12c64a
..
2908ba4
100644
(file)
--- a/
fish/destpaths.c
+++ b/
fish/destpaths.c
@@
-31,6
+31,7
@@
#include "fish.h"
#include "fish.h"
+#ifdef HAVE_LIBREADLINE
// From gnulib's xalloc.h:
/* Return 1 if an array of N objects, each of size S, cannot exist due
to size arithmetic overflow. S must be positive and N must be
// From gnulib's xalloc.h:
/* Return 1 if an array of N objects, each of size S, cannot exist due
to size arithmetic overflow. S must be positive and N must be
@@
-46,6
+47,7
@@
branch when S is known to be 1. */
# define xalloc_oversized(n, s) \
((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
branch when S is known to be 1. */
# define xalloc_oversized(n, s) \
((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+#endif
/* Readline completion for paths on the guest filesystem, also for
* devices and LVM names.
/* Readline completion for paths on the guest filesystem, also for
* devices and LVM names.
@@
-58,6
+60,7
@@
struct word {
int is_dir;
};
int is_dir;
};
+#ifdef HAVE_LIBREADLINE
static void
free_words (struct word *words, size_t nr_words)
{
static void
free_words (struct word *words, size_t nr_words)
{
@@
-68,6
+71,7
@@
free_words (struct word *words, size_t nr_words)
free (words[i].name);
free (words);
}
free (words[i].name);
free (words);
}
+#endif
char *
complete_dest_paths_generator (const char *text, int state)
char *
complete_dest_paths_generator (const char *text, int state)