On 11/22/19 11:31 AM, Petr Vorel wrote:
> From: Frederik Pasch <fpasch@xxxxxxxxxxxxxx>
>
> [ gustavo: rebased to 1.2.6 ]
> Signed-off-by: Gustavo Zacarias <gustavo@xxxxxxxxxxxxxxx>
> [ pvorel: taken from Buildroot distribution, rebased ]
> Reviewed-by: Petr Vorel <petr.vorel@xxxxxxxxx>
> Signed-off-by: Petr Vorel <petr.vorel@xxxxxxxxx>
> Signed-off-by: Frederik Pasch <fpasch@xxxxxxxxxxxxxx>
> ---
> support/nfs/nfs_mntent.c | 6 +++---
> utils/mount/error.c | 2 +-
> utils/mountd/fsloc.c | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
Committed... (tag: nfs-utils-2-4-3-rc2)
steved.
>
> diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c
> index 05a4c687..25e5944a 100644
> --- a/support/nfs/nfs_mntent.c
> +++ b/support/nfs/nfs_mntent.c
> @@ -9,7 +9,7 @@
> */
>
> #include <stdio.h>
> -#include <string.h> /* for index */
> +#include <string.h> /* for strchr */
> #include <ctype.h> /* for isdigit */
> #include <sys/stat.h> /* for umask */
> #include <unistd.h> /* for ftruncate */
> @@ -176,7 +176,7 @@ nfs_getmntent (mntFILE *mfp) {
> return NULL;
>
> mfp->mntent_lineno++;
> - s = index (buf, '\n');
> + s = strchr (buf, '\n');
> if (s == NULL) {
> /* Missing final newline? Otherwise extremely */
> /* long line - assume file was corrupted */
> @@ -184,7 +184,7 @@ nfs_getmntent (mntFILE *mfp) {
> fprintf(stderr, _("[mntent]: warning: no final "
> "newline at the end of %s\n"),
> mfp->mntent_file);
> - s = index (buf, 0);
> + s = strchr (buf, 0);
> } else {
> mfp->mntent_errs = 1;
> goto err;
> diff --git a/utils/mount/error.c b/utils/mount/error.c
> index 562f312e..986f0660 100644
> --- a/utils/mount/error.c
> +++ b/utils/mount/error.c
> @@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
> char *tmp;
>
> if (estr) {
> - if ((ptr = index(estr, ':')))
> + if ((ptr = strchr(estr, ':')))
> estr = ++ptr;
>
> tmp = &errbuf[spos];
> diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c
> index cf42944f..1b869b60 100644
> --- a/utils/mountd/fsloc.c
> +++ b/utils/mountd/fsloc.c
> @@ -128,7 +128,7 @@ static struct servers *method_list(char *data)
> bool v6esc = false;
>
> xlog(L_NOTICE, "method_list(%s)", data);
> - for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
> + for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
> ptr++;
> list = malloc(listsize * sizeof(char *));
> copy = strdup(data);
>
