X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/18b3351a3791f19a63c0af05640719db8eb5d184..813390c45f438f411662b1a55678e63f11681eb4:/cc.h

diff --git a/cc.h b/cc.h
index 04ff17f..f3a03f3 100644
--- a/cc.h
+++ b/cc.h
@@ -44,6 +44,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include <mLib/dstr.h>
 
 #include "key.h"
@@ -326,10 +329,66 @@ extern const encodeops *getencoding(const char */*ename*/);
 
 /*----- File hashing ------------------------------------------------------*/
 
+typedef struct fhashstate {
+  const gchash *gch;
+  unsigned f;
+  struct fhent *ents;
+} fhashstate;
+
+#define FHF_BINARY 0x100u
+#define FHF_PROGRESS 0x200u
+#define FHF_JUNK 0x400u
+
+#define FHF_MASK 0xff00u
+
+/* --- @gethash@ --- *
+ *
+ * Arguments:	@const char *name@ = pointer to name string
+ *
+ * Returns:	Pointer to appropriate hash class.
+ *
+ * Use:		Chooses a hash function by name.
+ */
+
+extern const gchash *gethash(const char */*name*/);
+
+/* --- @describefile@ --- *
+ *
+ * Arguments:	@const struct stat *st@ = pointer to file state
+ *
+ * Returns:	A snappy one-word description of the file.
+ */
+
+extern const char *describefile(const struct stat */*st*/);
+
+/* --- @fhash_init@ ---*
+ *
+ * Arguments:	@fhashstate *fh@ = pointer to fhash state to initialize
+ *		@const gchash *gch@ = hash class to set
+ *		@unsigned f@ initial flags to set
+ *
+ * Returns:	---
+ *
+ * Use:		Initializes an @fhashstate@ structure.
+ */
+
+extern void fhash_init(fhashstate */*fh*/,
+		       const gchash */*gch*/, unsigned /*f*/);
+
+/* --- @fhash_free@ --- *
+ *
+ * Arguments:	@fhashstate *fh@ = pointer to fhash state to free
+ *
+ * Returns:	---
+ *
+ * Use:		Frees an fhash state.
+ */
+
+extern void fhash_free(fhashstate */*fh*/);
+
 /* --- @fhash@ --- *
  *
- * Arguments:	@const gchash *gch@ = pointer to hash function to use
- *		@unsigned f@ = flags to set
+ * Arguments:	@fhashstate *fh@ = pointer to fhash state
  *		@const char *file@ = file name to be hashed (null for stdin)
  *		@void *buf@ = pointer to hash output buffer
  *
@@ -338,13 +397,57 @@ extern const encodeops *getencoding(const char */*ename*/);
  * Use:		Hashes a file.
  */
 
-#define FHF_BINARY 256u
-#define FHF_PROGRESS 512u
+extern int fhash(fhashstate */*fh*/, const char */*file*/, void */*buf*/);
+
+/* --- @fhash_junk@ --- *
+ *
+ * Arguments:	@fhashstate *fh@ = pointer to fhash state
+ *		@void (*func)(const char *, const struct stat *, void *)@
+ *		@void *p@ = pointer to pass to function
+ *
+ * Returns:	Positive if any junk was found, negative on error, zero if
+ *		everything was fine.
+ *
+ * Use:		Reports junk files in any directories covered by the hash
+ *		state.
+ */
+
+extern int fhash_junk(fhashstate */*fh*/,
+		      int (*/*func*/)(const char *,
+				      const struct stat *,
+				      void *),
+		      void */*p*/);
+
+/* --- @hfparse@ --- *
+ *
+ * Arguments:	@hfpctx *hfp@ = pointer to the context structure
+ *
+ * Returns:	A code indicating what happened.
+ *
+ * Use:		Parses a line from the input file.
+ */
 
-#define FHF_MASK 3840
+enum {					/* Meaning and members set */
+  HF_FILE,				/* File hash: @dline@ and @hbuf@ */
+  HF_ENC,				/* Encoding: @ee@ */
+  HF_HASH,				/* Hash function: @gch@ */
+  HF_ESC,				/* Name escape: @f@ */
+  HF_EOF,				/* End of file */
+  HF_BAD				/* Unrecognized line */
+};
 
-extern int fhash(const gchash */*gch*/, unsigned /*f*/,
-		 const char */*file*/, void */*buf*/);
+typedef struct hfpctx {
+  unsigned f;				/* Flags to read */
+#define HFF_ESCAPE 1u			/*   File names are escaped */
+  FILE *fp;				/* Input file to read */
+  dstr *dline;				/* Line contents, corrupted */
+  const gchash *gch;			/* Hash function to use */
+  const encodeops *ee;			/* Encoding to apply to hashes */
+  dstr *dfile;				/* File name for @HF_FILE@ lines */
+  octet *hbuf;				/* Output buffer for hash data */
+} hfpctx;
+
+extern int hfparse(hfpctx */*hfp*/);
 
 /*----- String I/O --------------------------------------------------------*/