Escape colons and similar in MRHKP output

[onak.git] / stats.c

diff --git a/stats.c b/stats.c
index ca7c929d73e29b0b357f6410a2917ad5718b22f3..e009de52da5f0a6a9cb0eadbdc303f839ddc7d9c 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -139,11 +139,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
        (void) config.dbbackend->cached_getkeysigs(fullwant);
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
        (void) config.dbbackend->cached_getkeysigs(fullwant);
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", have);
+               printf("Couldn't find key 0x%" PRIX64 ".\n", have);

                return;
        }
        if ((keyinfob = findinhash(fullwant)) == NULL) {
                return;
        }
        if ((keyinfob = findinhash(fullwant)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", want);
+               printf("Couldn't find key 0x%" PRIX64 ".\n", want);

                return;
        }
 
                return;
        }
 


@@ -164,8 +164,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
                        if (pathnum == 0) {
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
                        if (pathnum == 0) {

-                               printf("Can't find a link from 0x%08llX to "
-                               "0x%08llX%s\n",
+                               printf("Can't find a link from 0x%08" PRIX64
+                               " to 0x%08" PRIX64 "%s\n",

                                have,
                                want,
                                html ? "<BR>" : "");
                                have,
                                want,
                                html ? "<BR>" : "");


@@ -175,7 +175,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        }
                        pathnum = count;
                } else {
                        }
                        pathnum = count;
                } else {

-                       printf("%d steps from 0x%08llX to 0x%08llX%s\n",
+                       printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64
+                               "%s\n",

                                keyinfoa->colour, have & 0xFFFFFFFF,
                                want & 0xFFFFFFFF,
                                html ? "<BR>" : "");
                                keyinfoa->colour, have & 0xFFFFFFFF,
                                want & 0xFFFFFFFF,
                                html ? "<BR>" : "");


@@ -185,7 +186,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                                curkey->keyid);
                                if (html && uid == NULL) {
                                        printf("<a href=\"lookup?op=get&search="
                                                curkey->keyid);
                                if (html && uid == NULL) {
                                        printf("<a href=\"lookup?op=get&search="

-                                               "0x%08llX\">0x%08llX</a> (["
+                                               "0x%08" PRIX64 "\">0x%08" PRIX64
+                                               "</a> (["

                                                "User id not found])%s<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,
                                                "User id not found])%s<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,


@@ -193,9 +195,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                                        "" : " signs");
                                } else if (html && uid != NULL) {
                                        printf("<a href=\"lookup?op=get&search="
                                                        "" : " signs");
                                } else if (html && uid != NULL) {
                                        printf("<a href=\"lookup?op=get&search="

-                                               "0x%08llX\">0x%08llX</a>"
+                                               "0x%08" PRIX64 "\">0x%08"
+                                               PRIX64 "</a>"

                                                " (<a href=\"lookup?op=vindex&"
                                                " (<a href=\"lookup?op=vindex&"

-                                               "search=0x%08llX\">%s</a>)%s"
+                                               "search=0x%08" PRIX64 
+                                               "\">%s</a>)%s"

                                                "<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,
                                                "<BR>\n",
                                                curkey->keyid & 0xFFFFFFFF,
                                                curkey->keyid & 0xFFFFFFFF,


@@ -204,7 +208,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                                (curkey->keyid == fullwant) ?
                                                "" : " signs");
                                } else {
                                                (curkey->keyid == fullwant) ?
                                                "" : " signs");
                                } else {

-                                       printf("0x%08llX (%s)%s\n",
+                                       printf("0x%08" PRIX64 " (%s)%s\n",

                                                curkey->keyid & 0xFFFFFFFF,
                                                (uid == NULL) ?
                                                        "[User id not found]" :
                                                curkey->keyid & 0xFFFFFFFF,
                                                (uid == NULL) ?
                                                        "[User id not found]" :


@@ -228,7 +232,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        }
                        curkey = keyinfoa;
                        while (curkey != NULL && curkey->keyid != 0) {
                        }
                        curkey = keyinfoa;
                        while (curkey != NULL && curkey->keyid != 0) {

-                               printf("0x%08llX ", curkey->keyid & 0xFFFFFFFF);
+                               printf("0x%08" PRIX64 " ",
+                                               curkey->keyid & 0xFFFFFFFF);

                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');
                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');