Re: [RESEND PATCH 2/2] nfacct: adding quota capabilities

[Pablo Neira Ayuso <pablo@netfilter.org>]

On Wed, Apr 30, 2014 at 02:30:22PM -0600, Mathieu Poirier wrote:
> On 28 April 2014 04:20, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > On Mon, Apr 28, 2014 at 10:56:25AM +0200, Pablo Neira Ayuso wrote:
> >> > @@ -526,28 +569,93 @@ static int nfacct_cmd_help(int argc, char *argv[])
> >> >
> >> >  static int nfacct_cmd_restore(int argc, char *argv[])
> >> >  {
> >> > -   uint64_t pkts, bytes;
> >> > -   char name[512];
> >> > -   char buffer[512];
> >> > -   int ret;
> >> > +   uint64_t pkts, bytes, quota;
> >> > +   char name[512], mode[512], buffer[512];
> >> > +   int ret, flags;
> >> >
> >> >     while (fgets(buffer, sizeof(buffer), stdin)) {
> >> >             char *semicolon = strchr(buffer, ';');
> >> > +
> >> >             if (semicolon == NULL) {
> >> >                     nfacct_perror("invalid line");
> >> >                     return -1;
> >> >             }
> >> > +
> >> > +           /* a single ';' terminates the input */
> >> > +           if (strncmp(buffer, ";", 1) == 0)
> >> > +                   break;
> >>
> >> This chunk seems new, why is it needed there?
> >
> > I have applied this patch, we can clarify this or remove it in a
> > follow up patch.
> 
> I've investigated this a little more to find out that my EOF character
> wasn't coming in properly on my target.  After correction the original
> code works properly and as such the highlighted chunk is not needed.
> 
> I can send a new patch or you can edit it out directly - pls get back
> to me with that you prefer.

Please, send me a follow up patch. This is already in master. Thanks.