diff options
Diffstat (limited to 'src/diskio.c')
-rw-r--r-- | src/diskio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/diskio.c b/src/diskio.c index 9addd9b..b175a45 100644 --- a/src/diskio.c +++ b/src/diskio.c | |||
@@ -43,13 +43,13 @@ concat_dir (const char *base, const char *name, size_t *pbaselen) | |||
43 | char *dir; | 43 | char *dir; |
44 | 44 | ||
45 | while (len > 0 && base[len-1] == '/') | 45 | while (len > 0 && base[len-1] == '/') |
46 | len--; | 46 | len--; |
47 | 47 | ||
48 | size = len + 1 + strlen (name); | 48 | size = len + 1 + strlen (name); |
49 | dir = xmalloc (size + 1); | 49 | dir = grecs_malloc (size + 1); |
50 | memcpy (dir, base, len); | 50 | memcpy (dir, base, len); |
51 | dir[len++] = '/'; | 51 | dir[len++] = '/'; |
52 | strcpy (dir + len, name); | 52 | strcpy (dir + len, name); |
53 | 53 | ||
54 | if (pbaselen) | 54 | if (pbaselen) |
55 | *pbaselen = len; | 55 | *pbaselen = len; |
@@ -168,13 +168,13 @@ copy_file (const char *file, const char *dst_file) | |||
168 | fsize = st.st_size; | 168 | fsize = st.st_size; |
169 | 169 | ||
170 | for (bufsize = fsize; bufsize > 0 && (buf = malloc (bufsize)) == NULL; | 170 | for (bufsize = fsize; bufsize > 0 && (buf = malloc (bufsize)) == NULL; |
171 | bufsize /= 2) | 171 | bufsize /= 2) |
172 | ; | 172 | ; |
173 | if (bufsize == 0) | 173 | if (bufsize == 0) |
174 | xalloc_die (); | 174 | grecs_alloc_die (); |
175 | 175 | ||
176 | rc = 0; | 176 | rc = 0; |
177 | while (fsize > 0) | 177 | while (fsize > 0) |
178 | { | 178 | { |
179 | size_t rest; | 179 | size_t rest; |
180 | size_t rdbytes; | 180 | size_t rdbytes; |
@@ -489,13 +489,13 @@ make_signame (const char *file_name) | |||
489 | { | 489 | { |
490 | size_t len; | 490 | size_t len; |
491 | 491 | ||
492 | if (((len = strlen (file_name)) > SUF_SIG_LEN | 492 | if (((len = strlen (file_name)) > SUF_SIG_LEN |
493 | && memcmp (file_name + len - SUF_SIG_LEN, SUF_SIG, SUF_SIG_LEN))) | 493 | && memcmp (file_name + len - SUF_SIG_LEN, SUF_SIG, SUF_SIG_LEN))) |
494 | { | 494 | { |
495 | char *signame = xmalloc (len + SUF_SIG_LEN + 1); | 495 | char *signame = grecs_malloc (len + SUF_SIG_LEN + 1); |
496 | strcpy (signame, file_name); | 496 | strcpy (signame, file_name); |
497 | return strcat (signame, SUF_SIG); | 497 | return strcat (signame, SUF_SIG); |
498 | } | 498 | } |
499 | return NULL; | 499 | return NULL; |
500 | } | 500 | } |
501 | 501 | ||