Thread: [digraphanalysis-cvs] digraphanalysis/utils/gpg2digraph gpg2digraph.c,
Status: Planning
Brought to you by:
jbreker
Menu
▾
▴
digraphanalysis-cvs
|
From: Jeff B. <jb...@us...> - 2005-04-14 03:24:50
|
Update of /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24866/digraphanalysis/utils/gpg2digraph Modified Files: gpg2digraph.c Log Message: merging branch:JBREKER into MAIN Index: gpg2digraph.c =================================================================== RCS file: /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph/gpg2digraph.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gpg2digraph.c 16 Mar 2005 22:00:34 -0000 1.1 --- gpg2digraph.c 14 Apr 2005 03:24:28 -0000 1.2 *************** *** 25,30 **** --- 25,32 ---- char *do_pub(void); void do_sig(char *); + char *do_uid(void); unsigned int encode(char *); void func001(unsigned int); + char *get_fingerprint(); char *get_keyid(); char *get_name(); *************** *** 98,101 **** --- 100,148 ---- } + /* Handle a uid line. + */ + char * + do_uid() + { + char c, *keyid, *name; + + func001(7); + keyid = get_fingerprint() + 24; + func001(2); + name = get_name(); + fprintf(stdout, "n:%u:%s:%u:%s\n", strlen(keyid), keyid, strlen(name), name); + while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) + if (ferror(stdin)) + exit(EX_IOERR); + free(name); + + return keyid; + } + + /* Obtain the fingerprint from stdin. + */ + char * + get_fingerprint() + { + char c, *fingerprint; + unsigned int i; + + fingerprint = malloc(41); + + for (i = 0; i < 40; ++i) + { + c = fgetc(stdin); + if (feof(stdin) || ferror(stdin)) + exit(EX_IOERR); + c = toupper(c); + if (!isxdigit(c)) + exit(EX_DATAERR); + *(fingerprint + i) = (char) c; + } + *(fingerprint + 40) = '\0'; + + return fingerprint; + } + /* Obtain the keyid from stdin. */ *************** *** 191,194 **** --- 238,244 ---- do_sig(keyid_p); break; + case (117105100): /* uid */ + keyid_p = do_uid(); + break; default: break_while = 1; *************** *** 202,205 **** --- 252,283 ---- } break; + case (117105100): /* uid */ + keyid_p = do_uid(); + while (feof(stdin) == 0) + { + fgets(type, 4, stdin); + if (feof(stdin) || ferror(stdin)) + exit(EX_IOERR); + switch (encode(type)) + { + case (112117098): /* pub */ + keyid_p = do_pub(); + break; + case (115105103): /* sig */ + do_sig(keyid_p); + break; + case (117105100): /* uid */ + keyid_p = do_uid(); + break; + default: + break_while = 1; + break; + } + if(break_while) + { + break_while = 0; + break; + } + } default: break; |
|
From: Jeff B. <jb...@us...> - 2005-04-18 14:55:02
|
Update of /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21966 Modified Files: gpg2digraph.c Log Message: output alines Index: gpg2digraph.c =================================================================== RCS file: /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph/gpg2digraph.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gpg2digraph.c 14 Apr 2005 03:24:28 -0000 1.2 --- gpg2digraph.c 18 Apr 2005 14:54:49 -0000 1.3 *************** *** 69,73 **** if (strcmp(name, "[User ID not found]") != 0) { ! fprintf(stdout, "e:%u:%s:%u:%s\n", strlen(keyid_s), keyid_s, strlen(keyid_p), keyid_p); while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) if(ferror(stdin)) --- 69,73 ---- if (strcmp(name, "[User ID not found]") != 0) { ! fprintf(stdout, "e:%u:%s:%u:%s\n", strlen(keyid_p), keyid_p, strlen(keyid_s), keyid_s); while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) if(ferror(stdin)) *************** *** 80,84 **** } ! /* Handle a pub line. */ char * --- 80,86 ---- } ! /* Handle a pub line. Note: this should output only an a line, with this in mind ! * a lines will be renamed to n lines (dont do this until digraphanalysis ! * compiles cleanly handling the alias + node lists. */ char * *************** *** 91,95 **** func001(5); name = get_name(); ! fprintf(stdout, "n:%u:%s:%u:%s\n", strlen(keyid), keyid, strlen(name), name); while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) if (ferror(stdin)) --- 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", strlen(keyid), keyid, strlen(keyid), keyid, strlen(name), name); while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) if (ferror(stdin)) *************** *** 103,107 **** */ char * ! do_uid() { char c, *keyid, *name; --- 106,110 ---- */ char * ! do_uid(char *keyid_p) { char c, *keyid, *name; *************** *** 111,115 **** func001(2); name = get_name(); ! fprintf(stdout, "n:%u:%s:%u:%s\n", 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)) |
|
From: Jeff B. <jb...@us...> - 2005-04-26 03:49:37
|
Update of /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19894/utils/gpg2digraph Modified Files: gpg2digraph.c Log Message: outputs gpg stuff now Index: gpg2digraph.c =================================================================== RCS file: /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph/gpg2digraph.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gpg2digraph.c 18 Apr 2005 14:54:49 -0000 1.3 --- gpg2digraph.c 26 Apr 2005 03:49:28 -0000 1.4 *************** *** 25,29 **** char *do_pub(void); void do_sig(char *); ! char *do_uid(void); unsigned int encode(char *); void func001(unsigned int); --- 25,29 ---- char *do_pub(void); void do_sig(char *); ! char *do_uid(char *); unsigned int encode(char *); void func001(unsigned int); *************** *** 94,98 **** name = get_name(); fprintf(stdout, "n:%u:%s\n", strlen(keyid), keyid); ! fprintf(stdout, "a:%u:%s:%u:%s:%u:%s", strlen(keyid), keyid, strlen(keyid), keyid, strlen(name), name); while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) if (ferror(stdin)) --- 94,98 ---- 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)) *************** *** 242,246 **** break; case (117105100): /* uid */ ! keyid_p = do_uid(); break; default: --- 242,246 ---- break; case (117105100): /* uid */ ! keyid_p = do_uid(keyid_p); break; default: *************** *** 256,260 **** break; case (117105100): /* uid */ ! keyid_p = do_uid(); while (feof(stdin) == 0) { --- 256,260 ---- break; case (117105100): /* uid */ ! keyid_p = do_uid(keyid_p); while (feof(stdin) == 0) { *************** *** 271,275 **** break; case (117105100): /* uid */ ! keyid_p = do_uid(); break; default: --- 271,275 ---- break; case (117105100): /* uid */ ! keyid_p = do_uid(keyid_p); break; default: |
|
From: Jeff B. <jb...@us...> - 2005-05-27 14:24:54
|
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. */ |
|
From: Jeff B. <jb...@us...> - 2005-05-28 20:58:10
|
Update of /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32298/utils/gpg2digraph Modified Files: gpg2digraph.c Log Message: "bug" fixes :), we now work... almost Index: gpg2digraph.c =================================================================== RCS file: /cvsroot/digraphanalysis/digraphanalysis/utils/gpg2digraph/gpg2digraph.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gpg2digraph.c 27 May 2005 14:24:45 -0000 1.5 --- gpg2digraph.c 28 May 2005 20:58:00 -0000 1.6 *************** *** 44,53 **** name = get_name(); if (strcmp(name, "[User ID not found]") != 0) - { fprintf(stdout, "e:%u:%s:%u:%s\n", strlen(keyid_p), keyid_p, strlen(keyid_s), keyid_s); ! while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) ! if(ferror(stdin)) ! exit(EX_IOERR); ! } free(keyid_s); free(name); --- 44,51 ---- name = get_name(); if (strcmp(name, "[User ID not found]") != 0) fprintf(stdout, "e:%u:%s:%u:%s\n", strlen(keyid_p), keyid_p, strlen(keyid_s), keyid_s); ! while (((c = fgetc(stdin)) != '\n') && (feof(stdin) == 0)) ! if(ferror(stdin)) ! exit(EX_IOERR); free(keyid_s); free(name); *************** *** 242,246 **** break; case (117105100): /* uid */ ! keyid_p = do_uid(keyid_p); break; default: --- 240,244 ---- break; case (117105100): /* uid */ ! do_uid(keyid_p); break; default: *************** *** 256,260 **** break; case (117105100): /* uid */ ! keyid_p = do_uid(keyid_p); while (feof(stdin) == 0) { --- 254,258 ---- break; case (117105100): /* uid */ ! do_uid(keyid_p); while (feof(stdin) == 0) { *************** *** 271,275 **** break; case (117105100): /* uid */ ! keyid_p = do_uid(keyid_p); break; default: --- 269,273 ---- break; case (117105100): /* uid */ ! do_uid(keyid_p); break; default: |
Thanks for helping keep SourceForge clean.
X