From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-401830-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RRg1M-00038E-JC
for garchives@archives.gentoo.org; Sat, 19 Nov 2011 08:11:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 54C3D21C089;
Sat, 19 Nov 2011 08:11:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 26A4F21C095
for <gentoo-commits@lists.gentoo.org>; Sat, 19 Nov 2011 08:11:15 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9E1701B404E
for <gentoo-commits@lists.gentoo.org>; Sat, 19 Nov 2011 08:11:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id AE78480057
for <gentoo-commits@lists.gentoo.org>; Sat, 19 Nov 2011 08:11:13 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <453d13296d84472e6317472c2b27015b3ca612c4.vapier@gentoo>
Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/
X-VCS-Repository: proj/openrc
X-VCS-Files: src/rc/_usage.c
X-VCS-Directories: src/rc/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 453d13296d84472e6317472c2b27015b3ca612c4
Date: Sat, 19 Nov 2011 08:11:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: e909fa5b-9854-4ecd-a074-24b1f11ca28f
X-Archives-Hash: 591c95e4ef300028d57d39342afd3837
commit: 453d13296d84472e6317472c2b27015b3ca612c4
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 07:43:25 2011 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 07:43:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D=
commit;h=3D453d1329
rc: usage: do not output non-printable short options in usage
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
src/rc/_usage.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/rc/_usage.c b/src/rc/_usage.c
index 8aa1806..96c2d1a 100644
--- a/src/rc/_usage.c
+++ b/src/rc/_usage.c
@@ -24,6 +24,7 @@
*/
=20
#include "version.h"
+#include <ctype.h>
=20
#if lint
# define _noreturn
@@ -59,6 +60,7 @@ usage(int exit_status)
char *lo;
char *p;
char *token;
+ char val[4] =3D "-?,";
=20
#ifdef usagestring
printf(usagestring);
@@ -70,8 +72,9 @@ usage(int exit_status)
#endif
printf("\n\nOptions: [" getoptstring "]\n");
for (i =3D 0; longopts[i].name; ++i) {
- len =3D printf(" -%c, --%s %s", longopts[i].val, longopts[i].name,
- has_arg[longopts[i].has_arg]);
+ val[1] =3D longopts[i].val;
+ len =3D printf(" %3s --%s %s", isprint(longopts[i].val) ? val : "",
+ longopts[i].name, has_arg[longopts[i].has_arg]);
=20
lo =3D p =3D xstrdup(longopts_help[i]);
while ((token =3D strsep(&p, "\n"))) {