[PATCH] elkscmd: fix literal controls (replaces Tommy's #8, #12)

[PATCH] elkscmd: fix literal controls (replaces Tommy's #8, #12)

[claudio]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 321 bytes --]


This patches replaces literal control characters in levee source files
with their hexadecimal equivalents. Some extra care is required when
applying this patch if the email client tries to do something strange
with the literal controls, so I'll send it as an attachment.

This patch replaces Tommy's patches #8 and #12.

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1845 bytes --]

Only in elkscmd/file_utils: cat
Only in elkscmd/file_utils: chgrp
Only in elkscmd/file_utils: chmod
Only in elkscmd/file_utils: chown
Only in elkscmd/file_utils: cmp
Only in elkscmd/file_utils: cp
Only in elkscmd/file_utils: dd
Only in elkscmd/file_utils: grep
Only in elkscmd/file_utils: l
Only in elkscmd/file_utils: ln
Only in elkscmd/file_utils: ls
Only in elkscmd.orig/file_utils: ls.o
Only in elkscmd/file_utils: mkdir
Only in elkscmd/file_utils: mkfifo
Only in elkscmd/file_utils: mknod
Only in elkscmd/file_utils: more
Only in elkscmd/file_utils: mv
Only in elkscmd/file_utils: rm
Only in elkscmd/file_utils: rmdir
Only in elkscmd/file_utils: sync
Only in elkscmd/file_utils: touch
diff -rud elkscmd.orig/levee/insert.c elkscmd/levee/insert.c
--- elkscmd.orig/levee/insert.c	2004-05-27 21:07:57.000000000 -0300
+++ elkscmd/levee/insert.c	2004-05-29 07:26:08.000000000 -0300
@@ -85,8 +85,8 @@
 	Dflag = (cp==0 || core[cp-1]==EOL);
 	do {
 	    if (Dflag)
-		while ((cmd=peekc()) == '\x14' || cmd == '\x04') {
-		    if (readchar() == '\x14')
+		while ((cmd=peekc()) == 0x14 || cmd == 0x04) {	/* handle ^T, ^D */
+		    if (readchar() == 0x14)
 			currDLE = min(COLS,currDLE+shiftwidth);
 		    else
 			currDLE = max(0,currDLE-shiftwidth);
diff -rud elkscmd.orig/levee/misc.c elkscmd/levee/misc.c
--- elkscmd.orig/levee/misc.c	2004-05-27 21:07:54.000000000 -0300
+++ elkscmd/levee/misc.c	2004-05-29 07:49:00.000000000 -0300
@@ -392,10 +392,10 @@
 	    *size = (ip-start);
             return (c==ESC) ? ESC : EOL;
 	}
-	else if ((!beautify) || c == TAB || c == '\x16'
+	else if ((!beautify) || c == TAB || c == 0x16		/* ^V */
 			     || (c >= ' ' && c <= '~')) {
 	    if (ip < endd) {
-		if (c == '\x16')
+		if (c == 0x16)
 		    c = readchar();
 		switch (cclass(c)) {
 		    case 0 : ixp++; break;

Re: [PATCH] elkscmd: fix literal controls (replaces Tommy's #8, #12)

[Tommy McCabe]

--- claudio@conectiva.com wrote:
> 
> This patches replaces literal control characters in
> levee source files
> with their hexadecimal equivalents. Some extra care
> is required when
> applying this patch if the email client tries to do
> something strange
> with the literal controls, so I'll send it as an
> attachment.
> 
> This patch replaces Tommy's patches #8 and #12.

There was one more levee patch.

> > Only in elkscmd/file_utils: cat
> Only in elkscmd/file_utils: chgrp
> Only in elkscmd/file_utils: chmod
> Only in elkscmd/file_utils: chown
> Only in elkscmd/file_utils: cmp
> Only in elkscmd/file_utils: cp
> Only in elkscmd/file_utils: dd
> Only in elkscmd/file_utils: grep
> Only in elkscmd/file_utils: l
> Only in elkscmd/file_utils: ln
> Only in elkscmd/file_utils: ls
> Only in elkscmd.orig/file_utils: ls.o
> Only in elkscmd/file_utils: mkdir
> Only in elkscmd/file_utils: mkfifo
> Only in elkscmd/file_utils: mknod
> Only in elkscmd/file_utils: more
> Only in elkscmd/file_utils: mv
> Only in elkscmd/file_utils: rm
> Only in elkscmd/file_utils: rmdir
> Only in elkscmd/file_utils: sync
> Only in elkscmd/file_utils: touch
> diff -rud elkscmd.orig/levee/insert.c
> elkscmd/levee/insert.c
> --- elkscmd.orig/levee/insert.c	2004-05-27
> 21:07:57.000000000 -0300
> +++ elkscmd/levee/insert.c	2004-05-29
> 07:26:08.000000000 -0300
> @@ -85,8 +85,8 @@
>  	Dflag = (cp==0 || core[cp-1]==EOL);
>  	do {
>  	    if (Dflag)
> -		while ((cmd=peekc()) == '\x14' || cmd == '\x04') {
> -		    if (readchar() == '\x14')
> +		while ((cmd=peekc()) == 0x14 || cmd == 0x04) {	/*
> handle ^T, ^D */
> +		    if (readchar() == 0x14)
>  			currDLE = min(COLS,currDLE+shiftwidth);
>  		    else
>  			currDLE = max(0,currDLE-shiftwidth);
> diff -rud elkscmd.orig/levee/misc.c
> elkscmd/levee/misc.c
> --- elkscmd.orig/levee/misc.c	2004-05-27
> 21:07:54.000000000 -0300
> +++ elkscmd/levee/misc.c	2004-05-29
> 07:49:00.000000000 -0300
> @@ -392,10 +392,10 @@
>  	    *size = (ip-start);
>              return (c==ESC) ? ESC : EOL;
>  	}
> -	else if ((!beautify) || c == TAB || c == '\x16'
> +	else if ((!beautify) || c == TAB || c == 0x16		/*
> ^V */
>  			     || (c >= ' ' && c <= '~')) {
>  	    if (ip < endd) {
> -		if (c == '\x16')
> +		if (c == 0x16)
>  		    c = readchar();
>  		switch (cclass(c)) {
>  		    case 0 : ixp++; break;
> 



	
		
__________________________________
Do you Yahoo!?
Friends.  Fun.  Try the all-new Yahoo! Messenger.
http://messenger.yahoo.com/ 

Re: [PATCH] elkscmd: fix literal controls (replaces Tommy's #8, #12)

[claudio]

On Sat, 29 May 2004, Tommy McCabe wrote:

> > This patch replaces Tommy's patches #8 and #12.
>
> There was one more levee patch.

You're right, thanks. It seems that patch #7 also contains control
literals.  I'll check that and submit ASAP.

Re: [PATCH] elkscmd: fix literal controls (replaces Tommy's #8, #12)

[Miguel Bolanos]

Applied, thanks.

Mike

On Sat, 2004-05-29 at 04:53, claudio@conectiva.com wrote:
> This patches replaces literal control characters in levee source files
> with their hexadecimal equivalents. Some extra care is required when
> applying this patch if the email client tries to do something strange
> with the literal controls, so I'll send it as an attachment.
> 
> This patch replaces Tommy's patches #8 and #12.