projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update FSF address in copyright file.
[onak.git]
/
stats.c
diff --git
a/stats.c
b/stats.c
index 7f241ee1aad311548b6577567c6dbbbaee992dbc..da1f13c54e007b70fd8046b95b62f327fd58b602 100644
(file)
--- a/
stats.c
+++ b/
stats.c
@@
-4,13
+4,12
@@
* 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.10 2003/06/04 20:57:13 noodles Exp $
*/
#include <stdio.h>
#include <stdlib.h>
*/
#include <stdio.h>
#include <stdlib.h>
+#include "cleanup.h"
#include "getcgi.h"
#include "hash.h"
#include "keydb.h"
#include "getcgi.h"
#include "hash.h"
#include "keydb.h"
@@
-26,7
+25,7
@@
*/
void initcolour(bool parent)
{
*/
void initcolour(bool parent)
{
- unsigned
long
loop;
+ unsigned
int
loop;
struct ll *curkey;
/*
struct ll *curkey;
/*
@@
-62,21
+61,22
@@
unsigned long findpath(struct stats_key *have, struct stats_key *want)
struct ll *sigs = NULL;
struct ll *nextkeys = NULL;
long curdegree = 0;
struct ll *sigs = NULL;
struct ll *nextkeys = NULL;
long curdegree = 0;
- long count = 0;
+
unsigned
long count = 0;
curdegree = 1;
keys = lladd(NULL, want);
oldkeys = keys;
curdegree = 1;
keys = lladd(NULL, want);
oldkeys = keys;
- while (keys != NULL && have->colour == 0) {
+ while (
(!cleanup()) &&
keys != NULL && have->colour == 0) {
sigs = cached_getkeysigs(((struct stats_key *)
keys->object)->keyid);
sigs = cached_getkeysigs(((struct stats_key *)
keys->object)->keyid);
- while (sigs != NULL && have->colour == 0) {
+ while (
(!cleanup()) &&
sigs != NULL && have->colour == 0) {
/*
* Check if we've seen this key before and if not mark
* it and add its sigs to the list we want to look at.
*/
if (!((struct stats_key *)sigs->object)->disabled &&
/*
* Check if we've seen this key before and if not mark
* 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 =
@@
-134,8
+134,8
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
/*
* Make sure the keys we have and want are in the cache.
*/
/*
* Make sure the keys we have and want are in the cache.
*/
- cached_getkeysigs(fullhave);
- cached_getkeysigs(fullwant);
+
(void)
cached_getkeysigs(fullhave);
+
(void)
cached_getkeysigs(fullwant);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
printf("Couldn't find key 0x%llX.\n", have);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
printf("Couldn't find key 0x%llX.\n", have);
@@
-148,7
+148,7
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
pathnum = 0;
pathnum = 0;
- while (
pathnum < count
) {
+ while (
(!cleanup()) && (pathnum < count)
) {
/*
* Fill the tree info up.
*/
/*
* Fill the tree info up.
*/
@@
-162,11
+162,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,