[digraphanalysis-cvs] digraphanalysis/utils/gpg2digraph gpg2digraph.c,

[Jeff B. <jb...@us...>]

Update of /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv338/utils/gpg2digraph

Modified Files:
	gpg2digraph.c 
Log Message:
compiles
finishes condensation of list code


Index: gpg2digraph.c
===================================================================
RCS file: /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph/gpg2digraph.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gpg2digraph.c	26 Apr 2005 03:49:28 -0000	1.4
--- gpg2digraph.c	27 May 2005 14:24:45 -0000	1.5
***************
*** 32,59 ****
  char		*get_name();
  
- unsigned int
- encode(char *string)
- {
- 	return (tolower(toascii((*string))) * 1000000) + (tolower(toascii(*(string + 1))) * 1000) + (tolower(toascii(*(string + 2))));
- }
- 
- /* Advances over 'n' colons.
-  */
- void
- func001(unsigned int n)
- {
- 	char c;
- 	unsigned int i;
-  
- 	i = 0;
- 
- 	while (i < n)
- 		if ((c = fgetc(stdin)) == ':')
- 			++i;
- 		else
- 			if(feof(stdin) || ferror(stdin))
- 				exit(EX_IOERR);
- 	return;
- }
  /* Handle a sig line.
   */
--- 32,35 ----
***************
*** 93,98 ****
  	func001(5);
  	name = get_name();
! 	fprintf(stdout, "n:%u:%s\n", strlen(keyid), keyid);
! 	fprintf(stdout, "a:%u:%s:%u:%s:%u:%s\n", strlen(keyid), keyid, strlen(keyid), keyid, strlen(name), name);
  	while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0))
  		if (ferror(stdin))
--- 69,73 ----
  	func001(5);
  	name = get_name();
! 	fprintf(stdout, "n:%u:%s:%u:%s:%u:%s\n", strlen(keyid), keyid, strlen(keyid), keyid, strlen(name), name);
  	while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0))
  		if (ferror(stdin))
***************
*** 114,118 ****
  	func001(2);
  	name = get_name();
! 	fprintf(stdout, "a:%u:%s:%u:%s:%u:%s\n", strlen(keyid_p), keyid_p, strlen(keyid), keyid, strlen(name), name);
  	while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0))
  		if (ferror(stdin))
--- 89,93 ----
  	func001(2);
  	name = get_name();
! 	fprintf(stdout, "n:%u:%s:%u:%s:%u:%s\n", strlen(keyid_p), keyid_p, strlen(keyid), keyid, strlen(name), name);
  	while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0))
  		if (ferror(stdin))
***************
*** 123,126 ****
--- 98,126 ----
  }
  
+ unsigned int
+ encode(char *string)
+ {
+ 	return (tolower(toascii((*string))) * 1000000) + (tolower(toascii(*(string + 1))) * 1000) + (tolower(toascii(*(string + 2))));
+ }
+ 
+ /* Advances over 'n' colons.
+  */
+ void
+ func001(unsigned int n)
+ {
+ 	char c;
+ 	unsigned int i;
+  
+ 	i = 0;
+ 
+ 	while (i < n)
+ 		if ((c = fgetc(stdin)) == ':')
+ 			++i;
+ 		else
+ 			if(feof(stdin) || ferror(stdin))
+ 				exit(EX_IOERR);
+ 	return;
+ }
+ 
  /* Obtain the fingerprint from stdin.
   */