On Fri, Jul 30, 2021 at 12:57:07AM +0000, Al Viro wrote:
> On Wed, Jul 14, 2021 at 04:23:21PM -0400, Vivek Goyal wrote:
>
> > +static int __init split_fs_names(char *page, char *names)
> > {
> > + int count = 0;
> > + char *p = page;
> >
> > + strcpy(p, root_fs_names);
> > + while (*p++) {
> > + if (p[-1] == ',')
> > + p[-1] = '\0';
> > }
> > + *p = '\0';
> > +
> > + for (p = page; *p; p += strlen(p)+1)
> > + count++;
> >
> > + return count;
> > }
>
> Ummm.... The last part makes no sense - it counts '\0' in the array
> pointed to be page, until the first double '\0' in there. All of
> which had been put there by the loop immediately prior to that one...
I want split_fs_names() to replace ',' with space as well as return
number of null terminated strings found. So first loop just replaces
',' with '\0' and second loop counts number of strings.
Previously split_fs_names() was only replacing ',' with '\0'. Now
we are changing the semantics and returning number of strings
left in the buffer after the replacement.
I initilaly thought that if I can manage it with single loop but
there were quite a few corner cases. So I decided to use two
loops instead. One for replacement and one for counting.
>
> Incidentally, it treats stray ,, in root_fs_names as termination;
> is that intentional?
Just trying to keep the existing behavior. Existing get_fs_names(), also
replaces all instances of ',' with '\0'. So if there are two consecutive,
',', that will result in two consecutive '\0' and caller will view
it as end of buffer.
IOW, rootfsnames=foo,,bar will effectively be treated as "rootfsname=foo".
That's the current behavior and I did not try to improve on it just
keeps on increasing the size of patches. That's probably an improvement
for some other day if somebody cares.
Thanks
Vivek
