diff options
Diffstat (limited to 'mount.cifs.c')
| -rw-r--r-- | mount.cifs.c | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/mount.cifs.c b/mount.cifs.c index d307f4f..b1e8479 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -41,6 +41,7 @@ #include <limits.h> #include <fstab.h> #include "mount.h" +#include "util.h" #define MOUNT_CIFS_VERSION_MAJOR "1" #define MOUNT_CIFS_VERSION_MINOR "14" @@ -134,50 +135,6 @@ char * domain_name = NULL; char * prefixpath = NULL; const char *cifs_fstype = "cifs"; -/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We - * don't link to libreplace so need them here. */ - -/* like strncpy but does not 0 fill the buffer and always null - * terminates. bufsize is the size of the destination buffer */ - -#ifndef HAVE_STRLCPY -static size_t strlcpy(char *d, const char *s, size_t bufsize) -{ - size_t len = strlen(s); - size_t ret = len; - if (bufsize <= 0) return 0; - if (len >= bufsize) len = bufsize-1; - memcpy(d, s, len); - d[len] = 0; - return ret; -} -#endif - -/* like strncat but does not 0 fill the buffer and always null - * terminates. bufsize is the length of the buffer, which should - * be one more than the maximum resulting string length */ - -#ifndef HAVE_STRLCAT -static size_t strlcat(char *d, const char *s, size_t bufsize) -{ - size_t len1 = strlen(d); - size_t len2 = strlen(s); - size_t ret = len1 + len2; - - if (len1+len2 >= bufsize) { - if (bufsize < (len1+1)) { - return ret; - } - len2 = bufsize - (len1+1); - } - if (len2 > 0) { - memcpy(d+len1, s, len2); - d[len1+len2] = 0; - } - return ret; -} -#endif - /* * If an unprivileged user is doing the mounting then we need to ensure * that the entry is in /etc/fstab. |