diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-17 22:30:53 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-17 22:30:53 +0000 |
commit | fdffefb8032922ce7ffe4c00816072a8ff2148fc (patch) | |
tree | bc7313151a429c45d8bab8ad8b9dd32f4e51335f /src/libstddjb/openwritenclose_suffix.c | |
parent | a896ca2a8c617e5e00ffd5fc9e69331ad754e5b3 (diff) | |
download | skalibs-fdffefb8032922ce7ffe4c00816072a8ff2148fc.tar.xz |
More types changes
New disize
Add size_t to the autotypes list
Delete redundant and replace-libc files
dev_t/ino_t pass
Big size_t pass
More things missing, still not operational yet
Diffstat (limited to 'src/libstddjb/openwritenclose_suffix.c')
-rw-r--r-- | src/libstddjb/openwritenclose_suffix.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/libstddjb/openwritenclose_suffix.c b/src/libstddjb/openwritenclose_suffix.c index 1c538ed..8608810 100644 --- a/src/libstddjb/openwritenclose_suffix.c +++ b/src/libstddjb/openwritenclose_suffix.c @@ -1,24 +1,25 @@ /* ISC license. */ +#include <sys/types.h> +#include <string.h> #include <errno.h> #include <unistd.h> -#include <stdio.h> /* for rename() */ -#include <skalibs/uint64.h> -#include <skalibs/bytestr.h> +#include <stdio.h> #include <skalibs/djbunix.h> -int openwritenclose_suffix_internal (char const *fn, char const *s, unsigned int n, uint64 *dev, uint64 *ino, int dosync, char const *suffix) +int openwritenclose_suffix_internal (char const *fn, char const *s, size_t n, dev_t *dev, ino_t *ino, int dosync, char const *suffix) { - uint64 tmpdev, tmpino ; - unsigned int len = str_len(fn) ; - unsigned int suffixlen = str_len(suffix) ; + dev_t tmpdev ; + ino_t tmpino ; + size_t len = strlen(fn) ; + size_t suffixlen = strlen(suffix) ; char tmp[len + suffixlen + 1] ; - byte_copy(tmp, len, fn) ; - byte_copy(tmp + len, suffixlen + 1, suffix) ; + memcpy(tmp, fn, len) ; + memcpy(tmp + len, suffix, suffixlen + 1) ; if (!openwritenclose_unsafe_internal(tmp, s, n, dev ? &tmpdev : 0, ino ? &tmpino : 0, dosync)) return 0 ; if (rename(tmp, fn) < 0) { - register int e = errno ; + int e = errno ; unlink(tmp) ; errno = e ; return 0 ; |