cscvs to tla changeset 107

[onak.git] / stats.c

diff --git a/stats.c b/stats.c
index 61b527826c95f3b3fbb47fffea06b434d66aab91..108b8cc9a778b774a20a0e452df61f65d0a9b55b 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2000-2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2000-2002 Project Purple

+ *
+ * $Id: stats.c,v 1.12 2003/06/08 21:11:01 noodles Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -75,6 +77,7 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
                         * it and add its sigs to the list we want to look at.
                         */
                        if (!((struct stats_key *)sigs->object)->disabled &&
                         * it and add its sigs to the list we want to look at.
                         */
                        if (!((struct stats_key *)sigs->object)->disabled &&

+                           !((struct stats_key *)sigs->object)->revoked &&

                            ((struct stats_key *)sigs->object)->colour == 0) {
                                count++;
                                ((struct stats_key *)sigs->object)->colour =
                            ((struct stats_key *)sigs->object)->colour == 0) {
                                count++;
                                ((struct stats_key *)sigs->object)->colour =


@@ -160,11 +163,17 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        hashelements(),
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
                        hashelements(),
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {

-                       printf("Can't find a link from 0x%08llX to 0x%08llX"
-                               "%s\n",
+                       if (pathnum == 0) {
+                               printf("Can't find a link from 0x%08llX to "
+                               "0x%08llX%s\n",

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

+                       } else {
+                               printf("Can't find any further paths%s\n",
+                                       html ? "<BR>" : "");
+                       }
+                       pathnum = count;

                } else {
                        printf("%d steps from 0x%08llX to 0x%08llX%s\n",
                                keyinfoa->colour, have & 0xFFFFFFFF,
                } else {
                        printf("%d steps from 0x%08llX to 0x%08llX%s\n",
                                keyinfoa->colour, have & 0xFFFFFFFF,


@@ -222,13 +231,6 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');
                                curkey = findinhash(curkey->parent);
                        }
                        putchar('\n');

-                       if (html) {
-                               printf("<BR><A HREF=\"gpgwww?from=0x%08llX&"
-                                       "to=0x%08llX\">"
-                                       "Find reverse path</A>\n",
-                                       want,
-                                       have);
-                       }

                }
                pathnum++;
        }
                }
                pathnum++;
        }