search for: complete_dest_paths_generator

...k whether an entry is a directory, thus completing in the proper way. --- fish/destpaths.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fish/destpaths.c b/fish/destpaths.c index f224106..df1ec00 100644 --- a/fish/destpaths.c +++ b/fish/destpaths.c @@ -191,7 +191,13 @@ complete_dest_paths_generator (const char *text, int state) else { words = w; words[nr_words].name = p; - words[nr_words].is_dir = dirents->val[i].ftyp == 'd'; + if (dirents->val[i].ftyp == 'u' +...

--- fish/destpaths.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Add-MD-devices-to-guestfish-device-autocompletion.patch Type: text/x-patch Size: 400 bytes Desc: not available URL: <http://listman.redhat.com/archives/libguestfs/attachments/20111121/b667596b/attachment.bin>

...link, check whether it points to a directory, so the entry for it can be completed correctly. --- fish/destpaths.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fish/destpaths.c b/fish/destpaths.c index df1ec00..d39d6c0 100644 --- a/fish/destpaths.c +++ b/fish/destpaths.c @@ -192,6 +192,7 @@ complete_dest_paths_generator (const char *text, int state) words = w; words[nr_words].name = p; if (dirents->val[i].ftyp == 'u' + || dirents->val[i].ftyp == 'l' || dirents->val[i].ftyp == '...

...also annoying there ... > --- > fish/destpaths.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/fish/destpaths.c b/fish/destpaths.c > index f224106..df1ec00 100644 > --- a/fish/destpaths.c > +++ b/fish/destpaths.c > @@ -191,7 +191,13 @@ complete_dest_paths_generator (const char *text, int state) > else { > words = w; > words[nr_words].name = p; > - words[nr_words].is_dir = dirents->val[i].ftyp == 'd'; > + if (dirents->val[i].ftyp == &...

...tsize64 (g, parts[i]), -1); printf ("<partition dev=\"%s\" size=\"%" PRIi64 "\">\n", parts[i], size); diff --git a/fish/destpaths.c b/fish/destpaths.c index 1e42ae8..9a3da82 100644 --- a/fish/destpaths.c +++ b/fish/destpaths.c @@ -133,7 +133,7 @@ complete_dest_paths_generator (const char *text, int state) } while (0) /* Is it a device? */ - if (len < 5 || strncmp (text, "/dev/", 5) == 0) { + if (len < 5 || STREQLEN (text, "/dev/", 5)) { /* Get a list of everything that can possibly begin with /dev/ */ strs = guestfs...

...(size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) +# 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 @@ -103,33 +103,33 @@ complete_dest_paths_generator (const char *text, int state) guestfs_push_error_handler (g, NULL, NULL); -/* Silently do nothing if an allocation fails */ + /* Silently do nothing if an allocation fails */ #define APPEND_STRS_AND_FREE \ - do { \ - if (strs) { \ - size_t i; \ -...

...", lvs[j], size); + display_partition (g, lvs[j]); + printf ("</logvol>\n"); + free (lvs[j]); } } diff --git a/fish/destpaths.c b/fish/destpaths.c index a9d65a5..f4f1318 100644 --- a/fish/destpaths.c +++ b/fish/destpaths.c @@ -112,24 +112,24 @@ complete_dest_paths_generator (const char *text, int state) if (strs) { \ size_t i; \ size_t n = count_strings (strs); \ - \ + \ if ( ! xalloc_oversized (nr_words + n, sizeof (struct word))) { \ - struct wo...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.