520798 - Wrap long lines in the pk12util usage message

Status: RESOLVED DUPLICATE of bug 449332

(NSS :: Tools, defect)

Description

[Wan-Teh Chang]

Attachment: Proposed patch

The pk12util usage message has two lines that are longer
than 80 characters.  The proposed patch wraps those long
lines.

Before:

$ pk12util 
Usage:	 pk12util -i importfile [-d certdir] [-P dbprefix] [-h tokenname] [-v]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]
Usage:	 pk12util -l listfile [-d certdir] [-P dbprefix] [-h tokenname] [-r]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]
Usage:	 pk12util -o exportfile -n certname [-d certdir] [-P dbprefix] [-v]
		 [-c key_cipher] [-C cert_cipher] [-m | --key_len keyLen] [-n | --cert_key_len certKeyLen]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filefilepw]

After:

$ pk12util
Usage:	 pk12util -i importfile [-d certdir] [-P dbprefix] [-h tokenname] [-v]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]
Usage:	 pk12util -l listfile [-d certdir] [-P dbprefix] [-h tokenname] [-r]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]
Usage:	 pk12util -o exportfile -n certname [-d certdir] [-P dbprefix] [-v]
		 [-c key_cipher] [-C cert_cipher]
		 [-m | --key_len keyLen] [-n | --cert_key_len certKeyLen]
		 [-k slotpwfile | -K slotpw]
		 [-w p12filepwfile | -W p12filefilepw]

Comment 1

[Elio Maldonado]

Wan-Theh, When I execute pk12util without arguments I get"
Usage:	 pk12util -i importfile [-d certdir] [-P dbprefix] [-h tokenname]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]
		 [-v]
Usage:	 pk12util -l listfile [-d certdir] [-P dbprefix] [-h tokenname]
		 [-k slotpwfile | -K slotpw] [-w p12filepwfile | -W p12filepw]
		 [-v]
Usage:	 pk12util -o exportfile -n certname [-d certdir] [-P dbprefix]
		 [-c key_cipher] [-C cert_cipher]
		 [-m | --key_len keyLen] [--cert_key_len certKeyLen] [-v]
		 [-k slotpwfile | -K slotpw]
		 [-w p12filepwfile | -W p12filefilepw]

I don't see the long wrapping lines lines problem. On the other hand, the -r option (for dumping files as raw) is missing which is an error. The web page has -r missing also. That was my mistake on both places.

At the top of your patch I see that the diff is against 1.40 whereas the current revision is 1.42.  --elio

Comment 2

[Wan-Teh Chang]

Elio, you're right.  Sorry I didn't check the NSS trunk.
You fixed this in rev. 1.42 of pk12util.c.

Comment 3

[Elio Maldonado]

Comment on attachment 404847 [details] [diff] [review]
Proposed patch

Already fix in the bug this one of which this one is a duplicate.