git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change strncasecmp() == 0 to STRCASEEQLEN()
[libguestfs.git]
/
fish
/
destpaths.c
diff --git
a/fish/destpaths.c
b/fish/destpaths.c
index
275db49
..
c12c64a
100644
(file)
--- a/
fish/destpaths.c
+++ b/
fish/destpaths.c
@@
-18,8
+18,6
@@
#include <config.h>
#include <config.h>
-#define _GNU_SOURCE // for strndup, asprintf
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
@@
-135,7
+133,7
@@
complete_dest_paths_generator (const char *text, int state)
} while (0)
/* Is it a device? */
} 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_list_devices (g);
APPEND_STRS_AND_FREE;
/* Get a list of everything that can possibly begin with /dev/ */
strs = guestfs_list_devices (g);
APPEND_STRS_AND_FREE;
@@
-168,9
+166,9
@@
complete_dest_paths_generator (const char *text, int state)
for (i = 0; i < dirents->len; ++i) {
int err;
for (i = 0; i < dirents->len; ++i) {
int err;
- if (
strcmp (dirents->val[i].name, ".") != 0
&&
-
strcmp (dirents->val[i].name, "..") != 0
) {
- if (
strcmp (dir, "/") == 0
)
+ if (
STRNEQ (dirents->val[i].name, ".")
&&
+
STRNEQ (dirents->val[i].name, "..")
) {
+ if (
STREQ (dir, "/")
)
err = asprintf (&p, "/%s", dirents->val[i].name);
else
err = asprintf (&p, "%s/%s", dir, dirents->val[i].name);
err = asprintf (&p, "/%s", dirents->val[i].name);
else
err = asprintf (&p, "%s/%s", dir, dirents->val[i].name);
@@
-217,7
+215,7
@@
complete_dest_paths_generator (const char *text, int state)
word = &words[index];
index++;
word = &words[index];
index++;
- if (
strncasecmp (word->name, text, len) == 0
) {
+ if (
STRCASEEQLEN (word->name, text, len)
) {
if (word->is_dir)
rl_completion_append_character = '/';
if (word->is_dir)
rl_completion_append_character = '/';