nfsmount.conf: Remove duplicate 'bg' and 'fg' from parsing string.
Subsystems (2)
PATCH 1/2 nfsmount.conf: Remove duplicate 'bg' and 'fg' from parsing string.
When the 'Background' and/or 'Foreground' options are set in multiple sections of the nfsmount.conf file, each instance gets added to the parsing string. This patch makes the first instance of either option override the any others.
--- utils/mount/configfile.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
utils/mount/configfile.c +25 -0
@@ -164,6 +164,20 @@ add_entry(char *opt)SLIST_INSERT_HEAD (&head, entry, entries); }/* +* Check the alias list to see if the given +* opt is a alias +*/ +char *is_alias (char *opt) +{ +int i; + +for (i=0 ; i < mnt_alias_sz; i++) { +if (strcasecmp (opt, mnt_alias_tab[i].alias) ==0 ) +return mnt_alias_tab[i].opt; + } +return NULL ; +} +/* * See if the given entry exists if the link list, * if so return that entry */
@@ -171,10 +185,21 @@ inline staticchar *lookup_entry (char *opt) {struct entry *entry; +char *alias =is_alias (opt); SLIST_FOREACH(entry, &head, entries) {if (strcasecmp (entry->opt, opt) ==0 )return opt; +if (alias &&strcasecmp (entry->opt, alias) ==0 ) +return opt; +if (alias &&strcasecmp (alias,"fg" ) ==0 ) { +if (strcasecmp (entry->opt,"bg" ) ==0 ) +return opt; + } +if (alias &&strcasecmp (alias,"bg" ) ==0 ) { +if (strcasecmp (entry->opt,"fg" ) ==0 ) +return opt; + } }return NULL ; }
Signature · 1 line
1.8.3.1
PATCH 2/2 nfsmount.conf: remove duplicate 'timeo' from the parsing string
When the 'timeo' option is specified in multiple sections of the nfsmount.conf file, each instance is added to the parsing string. This patch make the first instance override any others.
--- utils/mount/configfile.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
utils/mount/configfile.c +10 -0
@@ -186,8 +186,18 @@ char *lookup_entry(char *opt) {struct entry *entry;char *alias =is_alias (opt); +char *ptr; SLIST_FOREACH(entry, &head, entries) { +/* +* Only check the left side or options that use '=' +*/ +if ((ptr =strchr (entry->opt,'=' )) !=0 ) { +int len = (int ) (ptr - entry->opt); + +if (strncasecmp (entry->opt, opt, len) ==0 ) +return opt; + }if (strcasecmp (entry->opt, opt) ==0 )return opt;if (alias &&strcasecmp (entry->opt, alias) ==0 )
Signature · 1 line
1.8.3.1
Re: [PATCH 2/2] nfsmount.conf: remove duplicate 'timeo' from the parsing string
Quoted 5 lines · Steve Dickson
When the 'timeo' option is specified in multiple sections of the nfsmount.conf file, each instance is added to the parsing string. This patch make the first instance override any others.
Signed-off-by Steve Dickson <[email protected]>
Committed...
steved.
Quoted 28 lines
--- utils/mount/configfile.c | 10 ++++++++++ 1 file changed, 10 insertions(+)utils/mount/configfile.c +10
-0@@ -186,8 +186,18 @@ char *lookup_entry(char *opt) {struct entry *entry;char *alias =is_alias (opt); +char *ptr; SLIST_FOREACH(entry, &head, entries) { +/* +* Only check the left side or options that use '=' +*/ +if ((ptr =strchr (entry->opt,'=' )) !=0 ) { +int len = (int ) (ptr - entry->opt); + +if (strncasecmp (entry->opt, opt, len) ==0 ) +return opt; + }if (strcasecmp (entry->opt, opt) ==0 )return opt;if (alias &&strcasecmp (entry->opt, alias) ==0 )
Quoted 6 lines · Steve Dickson
When the 'Background' and/or 'Foreground' options are set in multiple sections of the nfsmount.conf file, each instance gets added to the parsing string. This patch makes the first instance of either option override the any others.
Signed-off-by Steve Dickson <[email protected]>
Committed...
steved.
Quoted 52 lines
--- utils/mount/configfile.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)utils/mount/configfile.c +25
-0@@ -164,6 +164,20 @@ add_entry(char *opt)SLIST_INSERT_HEAD (&head, entry, entries); }/* +* Check the alias list to see if the given +* opt is a alias +*/ +char *is_alias (char *opt) +{ +int i; + +for (i=0 ; i < mnt_alias_sz; i++) { +if (strcasecmp (opt, mnt_alias_tab[i].alias) ==0 ) +return mnt_alias_tab[i].opt; + } +return NULL ; +} +/* * See if the given entry exists if the link list, * if so return that entry */ @@ -171,10 +185,21 @@ inline staticchar *lookup_entry (char *opt) {struct entry *entry; +char *alias =is_alias (opt); SLIST_FOREACH(entry, &head, entries) {if (strcasecmp (entry->opt, opt) ==0 )return opt; +if (alias &&strcasecmp (entry->opt, alias) ==0 ) +return opt; +if (alias &&strcasecmp (alias,"fg" ) ==0 ) { +if (strcasecmp (entry->opt,"bg" ) ==0 ) +return opt; + } +if (alias &&strcasecmp (alias,"bg" ) ==0 ) { +if (strcasecmp (entry->opt,"fg" ) ==0 ) +return opt; + } }return NULL ; }