From cfe0c54e8c3908cb32ef032310a39198b9da6d3a Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 11 May 1992 18:11:40 +0000
Subject: [PATCH] Formerly main.c.~42~
---
main.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/main.c b/main.c
index b2dcff05..6fb188a9 100644
--- a/main.c
+++ b/main.c
@@ -1037,7 +1037,8 @@ decode_switches (argc, argv)
*p++ = '-'; /* Non-option args are returned in order. */
for (i = 0; switches[i].c != '\0'; ++i)
{
- long_options[i].name = switches[i].long_name;
+ long_options[i].name = (switches[i].long_name == 0 ? "" :
+ switches[i].long_name);
*p++ = switches[i].c;
switch (switches[i].type)
{
@@ -1091,8 +1092,8 @@ decode_switches (argc, argv)
}
else
for (cs = switches; cs->c != '\0'; ++cs)
- {
- if (cs->c == c)
+ if (cs->c == c)
+ {
switch (cs->type)
{
default:
@@ -1158,9 +1159,9 @@ positive integral argument",
break;
}
- /* We've found the switch. Stop looking. */
- break;
- }
+ /* We've found the switch. Stop looking. */
+ break;
+ }
}
if (other_args != 0)