E CVS: libs/edb cpk

[<enl...@li...>]

Enlightenment CVS committal

Author  : cpk
Project : e17
Module  : libs/edb

Dir     : e17/libs/edb/tools


Modified Files:
	edb_ed.c 


Log Message:
At some point unescaping will actually work. Promised :)
The filetype efsd returns for e.g. gzipped files is correct now:

elwood@Tranquility:/home/elwood > file ./tst
./tst: gzip compressed data, deflated, original filename, last
modified: Tue Oct  3 16:09:21 2000, os: Unix
elwood@Tranquility:/home/elwood > efsdsh
gettype /home/elwood/tst
986751839.752150 Getfile event 1 on /home/elwood/tst
filetype is application/gnu-zip/original-filename/unix



===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/tools/edb_ed.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edb_ed.c	2001/04/08 17:18:42	1.12
+++ edb_ed.c	2001/04/08 17:44:23	1.13
@@ -63,10 +63,7 @@
 		for (i = 0; i < 2; i++)
 		  {
 		    if (*(str+2+i) == '\0')
-		      {
-			ptr--;
-			break;
-		      }
+		      break;
 		    
 		    digit = *(str+2+i); 
 		    
@@ -86,7 +83,7 @@
 		    ptr++;
 		  }
 		
-		str = ptr;
+		str = --ptr;
 	      }
 	      break;
 	    case '0':       /* \nnn -- octal value */
@@ -106,10 +103,7 @@
 		for (i = 0; i < 3; i++)
 		  {
 		    if (*(str+1+i) == '\0')
-		      {
-			ptr--;
-			break;
-		      }
+		      break;
 		    
 		    digit = *(str+1+i); 
 		    
@@ -122,8 +116,8 @@
 		    *s = val;
 		    ptr++;
 		  }
-		
-		str = ptr;
+
+		str = --ptr;
 	      }
 	      break;
 	    default:
@@ -138,7 +132,7 @@
 	  *s = *str;
 	}
     }
-  
+
   *s = '\0';
   return len;
 }
@@ -221,7 +215,7 @@
 	    exit(-1);
 	  }
 
-	if (!add && !del && !get && i < argc-1)
+	if (!add && !del && !get && argc > 2)
 	  continue;
 
 	if ((add) || (del) || (get))
@@ -316,17 +310,17 @@
 		else if (!strcmp(type, "data"))
 		  {
 		    int   size_ret;
-		    char *data;
+		    unsigned char *data;
 		    
-		    if ((data = (char*)e_db_data_get(db, key, &size_ret)) != NULL)
+		    if ((data = (unsigned char*)e_db_data_get(db, key, &size_ret)) != NULL)
 		      {
-			char *d = data;
+			unsigned char *d = data;
 			
 			while (d < data + size_ret)
 			  {
-			    for (i = 0; (i < 16) && (d != data + size_ret); i++)
+			    for (i = 0; (i < 16) && (d != data + size_ret); i++, d++)
 			      {
-				printf("%.2x ", *d++);
+				printf("%.2x ", *d);
 			      }
 			    printf("\n");
 			  }