move all common logic out to common

Author: Damien Churchill

Makefile

@@ -17,7 +17,7 @@ endif
 
 all: $(TARGETS)
 
-blksync: action.o chunk.o worker.o writer.o
+blksync: action.o chunk.o common.o worker.o writer.o
 
 testAction: action.o
 

action.h

@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef BS_ACTION
-#define BS_ACTION 1
+#ifndef BS_ACTION_H
+#define BS_ACTION_H
 
 typedef struct bs_action_t *Action;
 

blksync.c

@@ -28,54 +28,19 @@
 #include <mqueue.h>
 #include <sys/stat.h>
 
+#ifdef USE_GCRYPT
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
+
 #include "action.h"
 #include "chunk.h"
 #include "common.h"
 #include "worker.h"
-
-#ifdef USE_OPENSSL
-#include <openssl/sha.h>
-static inline void bs_sha1(void *hash, const void *message, size_t length) {
-    SHA1(message, length, hash);
-}
-#elif USE_GCRYPT
-#include <gcrypt.h>
-
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-
-static inline void bs_sha1(void *hash, const void *message, size_t length) {
-    gcry_md_hash_buffer(GCRY_MD_SHA1, hash, message, length);
-}
-#else
-#error No cryptographic library specififed.
-#endif
+#include "writer.h"
 
 #define NUM_THREADS 1
 
-/**
- * Safely open a file for read/write if it does not exist, without wiping
- * the contents of the file.
- */
-FILE *bs_open_rw(char *path) {
-    FILE *fp;
-
-    fp = fopen(path, "r+");
-    if (fp == NULL && errno == ENOENT) {
-        fp = fopen(path, "w+");
-    }
-    return fp;
-}
-
-/**
- * Print out a sha1 hash
- */
-static inline void bs_print_hash(unsigned char *hash, int length) {
-    int i;
-    for (i = 0; i < length; i++) {
-        printf("%02x", hash[i]);
-    }
-}
-
 /**
  * Main thead
  */
@@ -92,6 +57,7 @@ int main(int argc, char **argv) {
     struct mq_attr qattrs;
 
 #ifdef USE_GCRYPT
+
     if (!gcry_check_version(GCRYPT_VERSION)) {
         fputs ("libgcrypt version mismatch\n", stderr);
         exit(2);

chunk.h

@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef BS_CHUNK
-#define BS_CHUNK 1
+#ifndef BS_CHUNK_H
+#define BS_CHUNK_H
 
 typedef struct bs_chunk_t *Chunk;
 

common.c

@@ -0,0 +1,61 @@
+/***
+ * blksync - synchronize chunks of data between files and/or block devices
+ *
+ * Copyright (C) 2011  Damien Churchill <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <pthread.h>
+
+#include "common.h"
+
+#ifdef USE_OPENSSL
+void bs_sha1(void *hash, const void *message, size_t length) {
+        SHA1(message, length, hash);
+}
+#elif USE_GCRYPT
+void bs_sha1(void *hash, const void *message, size_t length) {
+        gcry_md_hash_buffer(GCRY_MD_SHA1, hash, message, length);
+}
+#else
+#error No cryptographic library specififed.
+#endif
+
+/**
+ * Print out a sha1 hash
+ */
+void bs_print_hash(unsigned char *hash, int length) {
+    int i;
+    for (i = 0; i < length; i++) {
+        printf("%02x", hash[i]);
+    }
+}
+
+/**
+ * Safely open a file for read/write if it does not exist, without wiping
+ * the contents of the file.
+ */
+FILE *bs_open_rw(char *path) {
+    FILE *fp;
+
+    fp = fopen(path, "r+");
+    if (fp == NULL && errno == ENOENT) {
+        fp = fopen(path, "w+");
+    }
+    return fp;
+}

common.h

@@ -18,8 +18,10 @@
  *
  */
 
-#ifndef BS_COMMON
-#define BS_COMMON 1
+#include <mqueue.h>
+
+#ifndef BS_COMMON_H
+#define BS_COMMON_H
 
 #define TRUE            1
 #define FALSE           0
@@ -37,4 +39,18 @@ typedef struct {
     int hash_length;
     int chunk_size;
 } params;
+
+#ifdef USE_OPENSSL
+#include <openssl/sha.h>
+#elif USE_GCRYPT
+#include <gcrypt.h>
+#else
+#error No cryptographic library specififed.
+#endif
+
+void bs_sha1(void *hash, const void *message, size_t length);
+
+void bs_print_hash(unsigned char *hash, int length);
+
+FILE *bs_open_rw(char *path);
 #endif

worker.h

@@ -18,4 +18,9 @@
  *
  */
 
+#ifndef BS_WORKER_H
+#define BS_WORKER_H
+
 void *bs_hash_chunk(void *arg);
+
+#endif

writer.c

@@ -18,6 +18,8 @@
  *
  */
 
+#include <stdlib.h>
+
 #include "writer.h"
 
 void *bs_write_backupfile(void *arg) {

writer.h

@@ -18,4 +18,9 @@
  *
  */
 
+#ifndef BS_WRITER_H
+#define BS_WRITER_H
+
 void *bs_write_backupfile(void *arg);
+
+#endif