Attachment 193225 Details for Bug 228100 – [PATCH] svn diff (patch-ods2.c patch-direct.c Makefile)

[patch] [PATCH] svn diff (patch-ods2.c patch-direct.c Makefile)

patch-all-svn.diff (text/plain), 5.00 KB, created by Oleg P. on 2018-05-10 06:03:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg P.

Created: 2018-05-10 06:03:08 UTC

Size: 5.00 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 469501)
>+++ Makefile	(working copy)
>@@ -7,7 +7,7 @@
> MASTER_SITES=	http://www.lugs.ch/~dussuett/
> DISTNAME=	ods2
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pzn.unixbsd@gmail.com
> COMMENT=	Utility for manipulating ODS-2 filesystems
> 
> USES=		zip
>Index: files/patch-direct.c
>===================================================================
>--- files/patch-direct.c	(nonexistent)
>+++ files/patch-direct.c	(working copy)
>@@ -0,0 +1,24 @@
>+--- direct.c.orig	2001-08-31 22:01:07.000000000 +0400
>++++ direct.c	2018-05-06 20:04:41.264004000 +0300
>+@@ -136,12 +136,15 @@
>+         register char sch = *name;
>+         if (sch != '*') {
>+             register char ech = *entry;
>+-                if (sch != ech) if (toupper(sch) != toupper(ech))
>+-                    if (sch == '%') {
>+-                        percent = MAT_NE;
>+-                    } else {
>+-                        break;
>+-                    }
>++                if (sch != ech) {
>++                   if (toupper(sch) != toupper(ech)) {
>++                      if (sch == '%') {
>++                          percent = MAT_NE;
>++                      } else {
>++                          break;
>++                      }
>++                   }
>++                }
>+         } else {
>+             break;
>+         }
>
>Property changes on: files/patch-direct.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-ods2.c
>===================================================================
>--- files/patch-ods2.c	(revision 469501)
>+++ files/patch-ods2.c	(working copy)
>@@ -1,8 +1,55 @@
>---- ods2.c.orig	2001-09-07 21:17:04 UTC
>-+++ ods2.c
>-@@ -1094,8 +1094,10 @@ int main(int argc,char *argv[])
>+--- ods2.c.orig	2001-09-08 01:17:04.000000000 +0400
>++++ ods2.c	2018-05-06 10:07:53.678876000 +0300
>+@@ -1076,10 +1076,17 @@
>+ int main(int argc,char *argv[])
>+ {
>+     char str[2048];
>++    char *ptr;
>++    int  iargc, i, ilen, len;
>++    int cmdline = 0;
>+     FILE *atfile = NULL;
>++
>+     printf(" ODS2 %s\n", MODULE_IDENT);
>++    if (argc>1) {   /* if exist argument in the command line TRUE */
>++        cmdline = 1;
>++        iargc = argc - 1;
>++    }
>+     while (1) {
>+-        char *ptr;
>+         if (atfile != NULL) {
>+             if (fgets(str,sizeof(str),atfile) == NULL) {
>+                 fclose(atfile);
>+@@ -1090,18 +1097,50 @@
>+                 if (ptr != NULL) *ptr = '\0';
>+                 printf("$> %s\n",str);
>+             }
>++        }
>++        else if (cmdline) {
>++            ptr = str;
>++            for ( len=0, ilen=0, i=argc-iargc; i<argc; i++ )
>++                if ( *argv[i] == '$' ) {
>++                    iargc--;
>++                    break;
>++                } else {
>++                    ilen = strlen(argv[i]);
>++                    len +=ilen;
>++                    if (len < sizeof(str))  {
>++                       strcpy(ptr, argv[i]);
>++                       ptr += ilen;
>++                       *ptr = ' ';
>++                       ptr++; *ptr = '\0';
>++                       iargc--;
>++                    } else {
>++                       printf("%%ODS2-CMD-LINE, len of arguments too long.\n");
>++                       break;
>++                    }
>++                }
>++            if (iargc == 0) cmdline = 0; /* if all arguments execute */
>++            if (ptr != str) printf("$> %s\n",str);
>+         } else {
>  #ifdef VMS
>- 	    if (getcmd (str, "$> ") == NULL) break;
>+-	    if (getcmd (str, "$> ") == NULL) break;
>++	  if (getcmd (str, "$> ") == NULL) break;
>  #else
> -            printf("$> ");
> -            if (gets(str) == NULL) break;
>@@ -11,5 +58,34 @@
> +              break;
> +          str[strlen(str)-1] = '\0'; /* strip newline from str */
>  #endif
>-         }
>+-        }
>++        }     /* if - else if - else  */
>          ptr = str;
>+-        while (*ptr == ' ' || *ptr == '\t') ptr++;
>+-        if (strlen(ptr) && *ptr != '!') {
>++        while (*ptr == ' ' || *ptr == '\t') ptr++; /*  space and tab */
>++        len = strlen(ptr);
>++        if (len && *ptr != '!') {
>+             if (*ptr == '@') {
>++                len--;
>++                /* remove trailing spaces and tabs */
>++                while (*(ptr+len) == ' ' || *(ptr+len) == '\t') {
>++                    *(ptr+len) = '\0';
>++                    len--;
>++                }
>+                 if (atfile != NULL) {
>+                     printf("%%ODS2-W-INDIRECT, indirect indirection not permitted\n");
>+                 } else {
>+@@ -1112,9 +1151,9 @@
>+                 }
>+             } else {
>+                 if ((cmdsplit(ptr) & 1) == 0) break;
>+-            }
>+-        }
>+-    }
>++            }   /* else */
>++        }       /* if   */
>++    }   /* while (1) */
>+     if (atfile != NULL) fclose(atfile);
>+     return 1;
>+ }

Actions: View | Diff

Attachments on bug 228100: 193211 | 193212 | 193213 | 193214 | 193225