[PATCH 0/2] Pull Request

[PATCH 0/2] Pull Request

[J William Piggott]

The following changes since commit 78f9ecb990b994e272d9a69670b5c006e7f9fcdc:

  blkid: Add dm-integrity superblock signature (2017-07-18 14:43:21 +0200)

are available in the git repository at:

  git@github.com:jwpi/util-linux.git 170717

for you to fetch changes up to 8c3a4703b173408d4f2e8dd8fcabf844b0cf0146:

  hwclock: fix regression from c3ae785 (2017-07-18 15:42:55 -0400)

----------------------------------------------------------------
J William Piggott (2):
      hwclock: remove unused epoch_option
      hwclock: fix regression from c3ae785

 sys-utils/hwclock.c | 7 ++++---
 sys-utils/hwclock.h | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 1/2] hwclock: remove unused epoch_option

[J William Piggott]

Also one whitespace fix.

Signed-off-by: J William Piggott <elseifthen@gmx.com>
---
 sys-utils/hwclock.c | 2 +-
 sys-utils/hwclock.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 423ebcd..9745158 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1468,7 +1468,7 @@ int main(int argc, char **argv)
 	}
 
 	if (ctl.set || ctl.predict) {
-		if (!ctl.date_opt){
+		if (!ctl.date_opt) {
 		warnx(_("--date is required for --set or --predict"));
 		hwclock_exit(&ctl, EX_USAGE);
 		}
diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h
index 61be57a..a1ef80c 100644
--- a/sys-utils/hwclock.h
+++ b/sys-utils/hwclock.h
@@ -64,7 +64,6 @@ typedef int bool;
 
 /* hwclock.c */
 extern int debug;
-extern unsigned long epoch_option;
 extern double time_diff(struct timeval subtrahend, struct timeval subtractor);
 
 /* rtc.c */

[PATCH 2/2] hwclock: fix regression from c3ae785

[J William Piggott]

hwclock --get foobar
hwclock: 3 too many arguments given

Fixed:

hwclock --get foobar
hwclock: 1 too many arguments given

Signed-off-by: J William Piggott <elseifthen@gmx.com>
---
 sys-utils/hwclock.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 9745158..9b313cf 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1448,9 +1448,10 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (argc > optind) {
+	argc -= optind;
+	if (argc > 0) {
 		warnx(_("%d too many arguments given"), argc);
-		errtryhelp(EXIT_FAILURE);
+		errtryhelp(EX_USAGE);
 	}
 
 	if (!ctl.adj_file_name)

Re: [PATCH 2/2] hwclock: fix regression from c3ae785

[Ruediger Meier]

On Tuesday 18 July 2017, J William Piggott wrote:
> hwclock --get foobar
> hwclock: 3 too many arguments given
>
> Fixed:
>
> hwclock --get foobar
> hwclock: 1 too many arguments given
>
> Signed-off-by: J William Piggott <elseifthen@gmx.com>
> ---
>  sys-utils/hwclock.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
> index 9745158..9b313cf 100644
> --- a/sys-utils/hwclock.c
> +++ b/sys-utils/hwclock.c
> @@ -1448,9 +1448,10 @@ int main(int argc, char **argv)
>  		}
>  	}
>
> -	if (argc > optind) {
> +	argc -= optind;
> +	if (argc > 0) {
>  		warnx(_("%d too many arguments given"), argc);

Oops, sorry for this regression ;)

Anyways, at least for me "1 too many arguments given" does not sound 
really understandable.  Maybe we don't need that number at all!?


> -		errtryhelp(EXIT_FAILURE);
> +		errtryhelp(EX_USAGE);

What about changing also the last other errtryhelp(EXIT_FAILURE) to 
EX_USAGE, 5 lines above?


>  	}
>
>  	if (!ctl.adj_file_name)
> --
> To unsubscribe from this list: send the line "unsubscribe util-linux"
> in the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] hwclock: fix regression from c3ae785

[Ruediger Meier]

On Tuesday 18 July 2017, Ruediger Meier wrote:
> On Tuesday 18 July 2017, J William Piggott wrote:
> > hwclock --get foobar
> > hwclock: 3 too many arguments given
> >
> > Fixed:
> >
> > hwclock --get foobar
> > hwclock: 1 too many arguments given
> >
> > Signed-off-by: J William Piggott <elseifthen@gmx.com>
> > ---
> >  sys-utils/hwclock.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
> > index 9745158..9b313cf 100644
> > --- a/sys-utils/hwclock.c
> > +++ b/sys-utils/hwclock.c
> > @@ -1448,9 +1448,10 @@ int main(int argc, char **argv)
> >  		}
> >  	}
> >
> > -	if (argc > optind) {
> > +	argc -= optind;
> > +	if (argc > 0) {
> >  		warnx(_("%d too many arguments given"), argc);
>
> Oops, sorry for this regression ;)

BTW I removed

-       argc -= optind;
-       argv += optind;

only where I thought *both* are not used later. In this case I've made a 
mistake. If you really want to keep "argc -= optind" then you could 
also re-add the unused "argv += optind" to avoid confusing other 
code-readers in future. Making the clang-analyzer happy is not the most 
important thing.

> Anyways, at least for me "1 too many arguments given" does not sound
> really understandable.  Maybe we don't need that number at all!?
>
> > -		errtryhelp(EXIT_FAILURE);
> > +		errtryhelp(EX_USAGE);
>
> What about changing also the last other errtryhelp(EXIT_FAILURE) to
> EX_USAGE, 5 lines above?
>
> >  	}
> >
> >  	if (!ctl.adj_file_name)
> > --
> > To unsubscribe from this list: send the line "unsubscribe
> > util-linux" in the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
> --
> To unsubscribe from this list: send the line "unsubscribe util-linux"
> in the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] hwclock: fix regression from c3ae785

[J William Piggott]

On 07/18/2017 04:46 PM, Ruediger Meier wrote:
> On Tuesday 18 July 2017, Ruediger Meier wrote:
>> On Tuesday 18 July 2017, J William Piggott wrote:
>>> hwclock --get foobar
>>> hwclock: 3 too many arguments given
>>>
>>> Fixed:
>>>
>>> hwclock --get foobar
>>> hwclock: 1 too many arguments given
>>>
>>> Signed-off-by: J William Piggott <elseifthen@gmx.com>
>>> ---
>>>  sys-utils/hwclock.c | 5 +++--
>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
>>> index 9745158..9b313cf 100644
>>> --- a/sys-utils/hwclock.c
>>> +++ b/sys-utils/hwclock.c
>>> @@ -1448,9 +1448,10 @@ int main(int argc, char **argv)
>>>  		}
>>>  	}
>>>
>>> -	if (argc > optind) {
>>> +	argc -= optind;
>>> +	if (argc > 0) {
>>>  		warnx(_("%d too many arguments given"), argc);
>>
>> Oops, sorry for this regression ;)
> 
> BTW I removed
> 
> -       argc -= optind;
> -       argv += optind;
> 
> only where I thought *both* are not used later. In this case I've made a 
> mistake. If you really want to keep "argc -= optind" then you could 
> also re-add the unused "argv += optind" to avoid confusing other 
> code-readers in future. Making the clang-analyzer happy is not the most 
> important thing.
>

Including it is confusing; it doesn't do anything.

>> Anyways, at least for me "1 too many arguments given" does not sound
>> really understandable.  Maybe we don't need that number at all!?
>>
>>> -		errtryhelp(EXIT_FAILURE);
>>> +		errtryhelp(EX_USAGE);
>>
>> What about changing also the last other errtryhelp(EXIT_FAILURE) to
>> EX_USAGE, 5 lines above?
>>
>>>  	}
>>>
>>>  	if (!ctl.adj_file_name)
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe
>>> util-linux" in the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe util-linux"
>> in the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe util-linux" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 2/2] hwclock: fix regression from c3ae785

[J William Piggott]

On 07/18/2017 04:33 PM, Ruediger Meier wrote:
> On Tuesday 18 July 2017, J William Piggott wrote:
>> hwclock --get foobar
>> hwclock: 3 too many arguments given
>>
>> Fixed:
>>
>> hwclock --get foobar
>> hwclock: 1 too many arguments given
>>
>> Signed-off-by: J William Piggott <elseifthen@gmx.com>
>> ---
>>  sys-utils/hwclock.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
>> index 9745158..9b313cf 100644
>> --- a/sys-utils/hwclock.c
>> +++ b/sys-utils/hwclock.c
>> @@ -1448,9 +1448,10 @@ int main(int argc, char **argv)
>>  		}
>>  	}
>>
>> -	if (argc > optind) {
>> +	argc -= optind;
>> +	if (argc > 0) {
>>  		warnx(_("%d too many arguments given"), argc);
> 
> Oops, sorry for this regression ;)
> 
> Anyways, at least for me "1 too many arguments given" does not sound 
> really understandable.  Maybe we don't need that number at all!?
>

I don't how it would be misunderstood, it's pretty straight forward
language.

I think the number could be helpful for complex commands like:

hwclock --predict --date jan 10 2017 --utc foo --noadjfile
hwclock: 3 too many arguments given


> 
>> -		errtryhelp(EXIT_FAILURE);
>> +		errtryhelp(EX_USAGE);
> 
> What about changing also the last other errtryhelp(EXIT_FAILURE) to 
> EX_USAGE, 5 lines above?

Good point. Pushed the change.

> 
> 
>>  	}
>>
>>  	if (!ctl.adj_file_name)
>> --
>> To unsubscribe from this list: send the line "unsubscribe util-linux"
>> in the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe util-linux" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[v3 PATCH 2/2] hwclock: fix regression from c3ae785

[J William Piggott]

hwclock --get foo
hwclock: 3 too many arguments given

Fixed:

hwclock --get foo
hwclock: 1 too many arguments given

Signed-off-by: J William Piggott <elseifthen@gmx.com>
---
 sys-utils/hwclock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 9745158..aadf196 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1444,13 +1444,13 @@ int main(int argc, char **argv)
 		case 'h':			/* --help */
 			usage(&ctl);
 		default:
-			errtryhelp(EXIT_FAILURE);
+			errtryhelp(EX_USAGE);
 		}
 	}
 
-	if (argc > optind) {
+	if (argc -= optind) {
 		warnx(_("%d too many arguments given"), argc);
-		errtryhelp(EXIT_FAILURE);
+		errtryhelp(EX_USAGE);
 	}
 
 	if (!ctl.adj_file_name)