projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace mh_xmalloc() with mh_xcalloc()
[mmh]
/
sbr
/
utils.c
diff --git
a/sbr/utils.c
b/sbr/utils.c
index
297ad45
..
f964e7e
100644
(file)
--- a/
sbr/utils.c
+++ b/
sbr/utils.c
@@
-11,6
+11,9
@@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sysexits.h>
/*
** We allocate space for messages (msgs array)
/*
** We allocate space for messages (msgs array)
@@
-19,44
+22,46
@@
#define MAXMSGS 256
/*
#define MAXMSGS 256
/*
-** Safely call malloc
+** Safely call realloc
*/
void *
*/
void *
-mh_xmalloc(size_t size)
+mh_xrealloc(void *ptr, size_t size)
{
void *memory;
{
void *memory;
- if (size == 0)
- adios(NULL, "Tried to malloc 0 bytes");
+ /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
+ if (!ptr) {
+ return mh_xcalloc((size_t) 1, size);
+ }
+ if (size == 0) {
+ adios(EX_SOFTWARE, NULL, "Tried to realloc 0 bytes");
+ }
- memory = malloc(size);
- if (!memory)
- adios(NULL, "Malloc failed");
+ memory = realloc(ptr, size);
+ if (!memory) {
+ adios(EX_OSERR, NULL, "Realloc failed");
+ }
return memory;
}
/*
return memory;
}
/*
-** Safely call realloc
+** Safely call calloc
*/
void *
*/
void *
-mh_xrealloc(void *ptr, size_t size)
+mh_xcalloc(size_t nmemb, size_t size)
{
void *memory;
{
void *memory;
- /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
- if (!ptr) {
- return mh_xmalloc(size);
+ if (nmemb == 0 || size == 0) {
+ adios(EX_SOFTWARE, NULL, "Tried to calloc 0 bytes");
}
}
- if (size == 0)
- adios(NULL, "Tried to realloc 0 bytes");
-
- memory = realloc(ptr, size);
- if (!memory)
- adios(NULL, "Realloc failed");
-
- return memory;
+ if ((memory = calloc(nmemb, size))) {
+ return memory;
+ } else {
+ adios(EX_OSERR, NULL, "calloc failed");
+ }
}
/*
}
/*
@@
-66,7
+71,7
@@
mh_xrealloc(void *ptr, size_t size)
char *
pwd(void)
{
char *
pwd(void)
{
- register char *cp;
+ char *cp;
static char curwd[PATH_MAX];
if (!getcwd(curwd, PATH_MAX)) {
static char curwd[PATH_MAX];
if (!getcwd(curwd, PATH_MAX)) {
@@
-102,12
+107,14
@@
add(char *s2, char *s1)
char *cp;
size_t len1 = 0, len2 = 0;
char *cp;
size_t len1 = 0, len2 = 0;
- if (s1)
+ if (s1) {
len1 = strlen(s1);
len1 = strlen(s1);
- if (s2)
+ }
+ if (s2) {
len2 = strlen(s2);
len2 = strlen(s2);
+ }
- cp = mh_xmalloc(len1 + len2 + 1);
+ cp = mh_xcalloc(len1 + len2 + 1, sizeof(char));
/* Copy s1 and free it */
if (s1) {
/* Copy s1 and free it */
if (s1) {
@@
-116,8
+123,9
@@
add(char *s2, char *s1)
}
/* Copy s2 */
}
/* Copy s2 */
- if (s2)
+ if (s2) {
memcpy(cp + len1, s2, len2);
memcpy(cp + len1, s2, len2);
+ }
/* Now NULL terminate the string */
cp[len1 + len2] = '\0';
/* Now NULL terminate the string */
cp[len1 + len2] = '\0';
@@
-138,20
+146,23
@@
create_folder(char *folder, int autocreate, void (*done_callback)(int))
char *cp;
if (stat(folder, &st) == -1) {
char *cp;
if (stat(folder, &st) == -1) {
- if (errno != ENOENT)
- adios(folder, "error on folder");
+ if (errno != ENOENT) {
+ adios(EX_IOERR, folder, "error on folder");
+ }
if (autocreate == 0) {
/* ask before creating folder */
cp = concat("Create folder \"", folder, "\"? ", NULL);
if (autocreate == 0) {
/* ask before creating folder */
cp = concat("Create folder \"", folder, "\"? ", NULL);
- if (!getanswer(cp))
- done_callback(1);
+ if (!getanswer(cp)) {
+ done_callback(EX_CANTCREAT);
+ }
free(cp);
} else if (autocreate == -1) {
/* do not create, so exit */
free(cp);
} else if (autocreate == -1) {
/* do not create, so exit */
- done_callback(1);
+ done_callback(EX_CANTCREAT);
+ }
+ if (!makedir(folder)) {
+ adios(EX_CANTCREAT, NULL, "unable to create folder %s", folder);
}
}
- if (!makedir(folder))
- adios(NULL, "unable to create folder %s", folder);
}
}
}
}
@@
-165,11
+176,13
@@
num_digits(int n)
int ndigits = 0;
/* Sanity check */
int ndigits = 0;
/* Sanity check */
- if (n < 0)
- adios(NULL, "oops, num_digits called with negative value");
+ if (n < 0) {
+ adios(EX_SOFTWARE, NULL, "oops, num_digits called with negative value");
+ }
- if (n == 0)
+ if (n == 0) {
return 1;
return 1;
+ }
while (n) {
n /= 10;
while (n) {
n /= 10;
@@
-187,8
+200,9
@@
num_digits(int n)
void
app_msgarg(struct msgs_array *msgs, char *cp)
{
void
app_msgarg(struct msgs_array *msgs, char *cp)
{
- if(msgs->size >= msgs->max)
+ if(msgs->size >= msgs->max) {
msgs->msgs = mh_xrealloc(msgs->msgs,
(msgs->max+=MAXMSGS)*sizeof(*msgs->msgs));
msgs->msgs = mh_xrealloc(msgs->msgs,
(msgs->max+=MAXMSGS)*sizeof(*msgs->msgs));
+ }
msgs->msgs[msgs->size++] = cp;
}
msgs->msgs[msgs->size++] = cp;
}