Attachment 292100 Details for Bug 429231 – This is a patch fixing this bug

[patch] This is a patch fixing this bug

dos2unix-3.1.patch (text/plain), 1.56 KB, created by Peng Haitao on 2008-01-18 03:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peng Haitao

Created: 2008-01-18 03:00:24 UTC

Size: 1.56 KB

patch

obsolete

>diff -Nur dos2unix-3.1.orig/dos2unix.c dos2unix-3.1/dos2unix.c
>--- dos2unix-3.1.orig/dos2unix.c	2008-01-18 09:40:12.000000000 +0800
>+++ dos2unix-3.1/dos2unix.c	2008-01-18 10:17:17.000000000 +0800
>@@ -533,19 +533,28 @@
>       
>       if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0))
>       {
>-        ArgIdx++;
>-        if (strcmpi(argv[ArgIdx],"ASCII") == 0)
>-          pFlag->ConvMode = 0;
>-        else if (strcmpi(argv[ArgIdx], "7Bit") == 0)
>-          pFlag->ConvMode = 1;
>-        else if (strcmpi(argv[ArgIdx], "ISO") == 0)
>-          pFlag->ConvMode = 2;
>-        else if (strcmpi(argv[ArgIdx], "Mac") == 0)
>-          pFlag->ConvMode = 3;
>+        if (++ArgIdx < argc)
>+        {
>+          if (strcmpi(argv[ArgIdx],"ASCII") == 0)
>+            pFlag->ConvMode = 0;
>+          else if (strcmpi(argv[ArgIdx], "7Bit") == 0)
>+            pFlag->ConvMode = 1;
>+          else if (strcmpi(argv[ArgIdx], "ISO") == 0)
>+            pFlag->ConvMode = 2;
>+          else if (strcmpi(argv[ArgIdx], "Mac") == 0)
>+            pFlag->ConvMode = 3;
>+          else
>+          {
>+            if (!pFlag->Quiet)
>+              fprintf(stderr, "dos2unix: invalid %s conversion mode specified\n",argv[ArgIdx]);
>+            ShouldExit = 1;
>+          }
>+        }
>         else
>         {
>+          ArgIdx--;
>           if (!pFlag->Quiet)
>-            fprintf(stderr, "dos2unix: invalid %s conversion mode specified\n",argv[ArgIdx]);
>+            fprintf(stderr,"dos2unix: option `%s' requires an argument\n",argv[ArgIdx]);
>           ShouldExit = 1;
>         }
>       }

Actions: View | Diff

Attachments on bug 429231: 292100