#include <unistd.h>
#include <time.h>
-#include "util.h"
-
#ifdef DEBUG
#define DEBUG_FD 8
#define DPRINTF_D(x) xprintf(DEBUG_FD, #x "=%d\n", x)
return p;
}
+static size_t
+xstrlcpy(char *dest, const char *src, size_t n)
+{
+ size_t i;
+
+ for (i = 0; i < n && *src; i++)
+ *dest++ = *src++;
+
+ if (n) {
+ *dest = '\0';
+
+#ifdef CHECK_XSTRLCPY_RET
+ /* Compiling this out as we are not checking
+ the return value anywhere (controlled case).
+ Just returning the number of bytes copied. */
+ while(*src++)
+ i++;
+#endif
+ }
+
+ return i;
+}
+
/*
* The poor man's implementation of memrchr().
* We are only looking for '/' in this program.
static char out[PATH_MAX];
char tmp[PATH_MAX], *p;
- strlcpy(tmp, path, sizeof(tmp));
+ xstrlcpy(tmp, path, sizeof(tmp));
p = dirname(tmp);
if (p == NULL)
printerr(1, "dirname");
- strlcpy(out, p, sizeof(out));
+ xstrlcpy(out, p, sizeof(out));
return out;
}
#endif
static char name[PATH_MAX];
char *last_slash;
- strlcpy(name, path, PATH_MAX);
+ xstrlcpy(name, path, PATH_MAX);
/* Find last '/'. */
- last_slash = name != NULL ? strrchr(name, '/') : NULL;
+ last_slash = strrchr(name, '/');
if (last_slash != NULL && last_slash != name && last_slash[1] == '\0') {
/* Determine whether all remaining characters are slashes. */
{
/* Handle absolute path */
if (name[0] == '/')
- strlcpy(out, name, n);
+ xstrlcpy(out, name, n);
else {
/* Handle root case */
if (strcmp(dir, "/") == 0)
if (filter(re, dp->d_name) == 0)
continue;
*dents = xrealloc(*dents, (n + 1) * sizeof(**dents));
- strlcpy((*dents)[n].name, dp->d_name, sizeof((*dents)[n].name));
+ xstrlcpy((*dents)[n].name, dp->d_name, sizeof((*dents)[n].name));
/* Get mode flags */
mkpath(path, dp->d_name, newpath, sizeof(newpath));
r = lstat(newpath, &sb);
regex_t re;
int r, fd;
- strlcpy(path, ipath, sizeof(path));
- strlcpy(fltr, ifilter, sizeof(fltr));
+ xstrlcpy(path, ipath, sizeof(path));
+ xstrlcpy(fltr, ifilter, sizeof(fltr));
oldpath[0] = '\0';
newpath[0] = '\0';
begin:
goto nochange;
}
/* Save history */
- strlcpy(oldpath, path, sizeof(oldpath));
- strlcpy(path, dir, sizeof(path));
+ xstrlcpy(oldpath, path, sizeof(oldpath));
+ xstrlcpy(path, dir, sizeof(path));
/* Reset filter */
- strlcpy(fltr, ifilter, sizeof(fltr));
+ xstrlcpy(fltr, ifilter, sizeof(fltr));
goto begin;
case SEL_GOIN:
/* Cannot descend in empty directories */
printwarn();
goto nochange;
}
- strlcpy(path, newpath, sizeof(path));
+ xstrlcpy(path, newpath, sizeof(path));
/* Reset filter */
- strlcpy(fltr, ifilter, sizeof(fltr));
+ xstrlcpy(fltr, ifilter, sizeof(fltr));
goto begin;
case S_IFREG:
{
r = setfilter(&re, tmp);
if (r != 0)
goto nochange;
- strlcpy(fltr, tmp, sizeof(fltr));
+ xstrlcpy(fltr, tmp, sizeof(fltr));
DPRINTF_S(fltr);
/* Save current */
if (ndents > 0)
printwarn();
goto nochange;
}
- strlcpy(path, newpath, sizeof(path));
+ xstrlcpy(path, newpath, sizeof(path));
/* Reset filter */
- strlcpy(fltr, ifilter, sizeof(fltr));
+ xstrlcpy(fltr, ifilter, sizeof(fltr));
DPRINTF_S(path);
goto begin;
case SEL_CDHOME:
printwarn();
goto nochange;
}
- strlcpy(path, tmp, sizeof(path));
+ xstrlcpy(path, tmp, sizeof(path));
/* Reset filter */
- strlcpy(fltr, ifilter, sizeof(fltr));
+ xstrlcpy(fltr, ifilter, sizeof(fltr));
DPRINTF_S(path);
goto begin;
case SEL_TOGGLEDOT:
showhidden ^= 1;
initfilter(showhidden, &ifilter);
- strlcpy(fltr, ifilter, sizeof(fltr));
+ xstrlcpy(fltr, ifilter, sizeof(fltr));
goto begin;
case SEL_DETAIL:
showdetail = !showdetail;
+++ /dev/null
-/*
- * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <string.h>
-
-#include "util.h"
-
-/*
- * Appends src to string dst of size dsize (unlike strncat, dsize is the
- * full size of dst, not space left). At most dsize-1 characters
- * will be copied. Always NUL terminates (unless dsize <= strlen(dst)).
- * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
- * If retval >= dsize, truncation occurred.
- */
-size_t
-strlcat(char *dst, const char *src, size_t dsize)
-{
- const char *odst = dst;
- const char *osrc = src;
- size_t n = dsize;
- size_t dlen;
-
- /* Find the end of dst and adjust bytes left but don't go past end. */
- while (n-- != 0 && *dst != '\0')
- dst++;
- dlen = dst - odst;
- n = dsize - dlen;
-
- if (n-- == 0)
- return(dlen + strlen(src));
- while (*src != '\0') {
- if (n != 0) {
- *dst++ = *src;
- n--;
- }
- src++;
- }
- *dst = '\0';
-
- return(dlen + (src - osrc)); /* count does not include NUL */
-}
+++ /dev/null
-/*
- * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <string.h>
-
-#include "util.h"
-
-/*
- * Copy string src to buffer dst of size dsize. At most dsize-1
- * chars will be copied. Always NUL terminates (unless dsize == 0).
- * Returns strlen(src); if retval >= dsize, truncation occurred.
- */
-size_t
-strlcpy(char *dst, const char *src, size_t dsize)
-{
- const char *osrc = src;
- size_t nleft = dsize;
-
- /* Copy as many bytes as will fit. */
- if (nleft != 0) {
- while (--nleft != 0) {
- if ((*dst++ = *src++) == '\0')
- break;
- }
- }
-
- /* Not enough room in dst, add NUL and traverse rest of src. */
- if (nleft == 0) {
- if (dsize != 0)
- *dst = '\0'; /* NUL-terminate dst */
- while (*src++)
- ;
- }
-
- return(src - osrc - 1); /* count does not include NUL */
-}