safe_strdup() and variable progname in util.c

1 files changed, 8 insertions, 6 deletions

diff --git a/src/util.h b/src/util.h
index abfb666..86310fc 100644
--- a/src/util.h
+++ b/src/util.h
@@ -4,19 +4,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include "../config.h"
 
-#define safe_malloc(size) safe_malloc_(size, __FILENAME__, __LINE__)
-#define safe_realloc(ptr, size) safe_realloc_(ptr, size, __FILENAME__, __LINE__)
-#define safe_fopen(path, mode) safe_fopen_(path, mode, __FILENAME__, __LINE__)
+
+#define _PROGNAME "redo"
+
+#define safe_malloc(size) safe_malloc_(size, _FILENAME, __LINE__)
+#define safe_realloc(ptr, size) safe_realloc_(ptr, size, _FILENAME, __LINE__)
+#define safe_fopen(path, mode) safe_fopen_(path, mode, _FILENAME, __LINE__)
+#define safe_strdup(str) safe_strdup_(str, _FILENAME, __LINE__)
 
 extern void *safe_malloc_(size_t size, const char *file, unsigned int line);
 extern void *safe_realloc_(void *ptr, size_t size, const char *file, unsigned int line);
+extern char *safe_strdup_(const char *str, const char *file, unsigned line);
 extern FILE *safe_fopen_(const char *path, const char *mode,
                          const char *file, unsigned int line);
 extern char *concat(size_t count, ...);
-extern char *ec_strdup(const char* str);
-extern char *strdup(const char *str);
 extern char *xbasename(const char *path);
 
 #endif