projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unused parameter from mbx_copy().
[mmh]
/
sbr
/
utils.c
diff --git
a/sbr/utils.c
b/sbr/utils.c
index
5c1253d
..
641a75d
100644
(file)
--- a/
sbr/utils.c
+++ b/
sbr/utils.c
@@
-45,11
+45,12
@@
mh_xrealloc(void *ptr, size_t size)
void *memory;
/* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
void *memory;
/* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */
- if (!ptr)
+ if (!ptr) {
return mh_xmalloc(size);
return mh_xmalloc(size);
+ }
if (size == 0)
if (size == 0)
- adios(NULL, "Tried to realloc 0bytes");
+ adios(NULL, "Tried to realloc 0 bytes");
memory = realloc(ptr, size);
if (!memory)
memory = realloc(ptr, size);
if (!memory)
@@
-70,16
+71,18
@@
pwd(void)
if (!getcwd(curwd, PATH_MAX)) {
admonish(NULL, "unable to determine working directory");
if (!getcwd(curwd, PATH_MAX)) {
admonish(NULL, "unable to determine working directory");
- if (!mypath || !*mypath
- || (strcpy(curwd, mypath), chdir(curwd)) == -1) {
+ if (!mypath || !*mypath ||
+ (strcpy(curwd, mypath), chdir(curwd)) == -1) {
strcpy(curwd, "/");
chdir(curwd);
}
return curwd;
}
strcpy(curwd, "/");
chdir(curwd);
}
return curwd;
}
- if ((cp = curwd + strlen(curwd) - 1) > curwd && *cp == '/')
+ if ((cp = curwd + strlen(curwd) - 1) > curwd && *cp == '/') {
+ /* strip trailing slash */
*cp = '\0';
*cp = '\0';
+ }
return curwd;
}
return curwd;
}
@@
-87,6
+90,7
@@
pwd(void)
/*
** add -- If "s1" is NULL, this routine just creates a
** -- copy of "s2" into newly malloc'ed memory.
/*
** add -- If "s1" is NULL, this routine just creates a
** -- copy of "s2" into newly malloc'ed memory.
+** -- (use getcpy() instead in this case)
** --
** -- If "s1" is not NULL, then copy the concatenation
** -- of "s1" and "s2" (note the order) into newly
** --
** -- If "s1" is not NULL, then copy the concatenation
** -- of "s1" and "s2" (note the order) into newly