* ruby.c (proc_options): ignore trailing CRs at the end of short

  options as well as long options.  fixed: [ruby-core:04232]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 2 deletions

diff --git a/ruby.c b/ruby.c
index 8f39204e1..773ef7b81 100644
--- a/ruby.c
+++ b/ruby.c
@@ -683,9 +683,20 @@ proc_options(argc, argv)
 	    }
 	    break;
 
+	  case '\r':
+	    if (!s[1]) break;
+
 	  default:
-	    fprintf(stderr, "%s: invalid option -%c  (-h will show valid options)\n",
-		    origargv[0], *s);
+	    {
+		const char *format;
+		if (ISPRINT(*s)) {
+		    format = "%s: invalid option -%c  (-h will show valid options)\n";
+		}
+		else {
+		    format = "%s: invalid option -\\%03o  (-h will show valid options)\n";
+		}
+		fprintf(stderr, format, origargv[0], (int)(unsigned char)*s);
+	    }
 	    exit(2);
 
 	  case 0: