}
-struct map_struct *map_file(int fd,OFF_T len)
-{
- struct map_struct *ret;
- ret = (struct map_struct *)malloc(sizeof(*ret));
- if (!ret) out_of_memory("map_file");
-
- ret->map = NULL;
- ret->fd = fd;
- ret->size = len;
- ret->p = NULL;
- ret->p_size = 0;
- ret->p_offset = 0;
- ret->p_len = 0;
-
-#ifdef HAVE_MMAP
- if (len < MAX_MAP_SIZE) {
- ret->map = (char *)mmap(NULL,len,PROT_READ,MAP_SHARED,fd,0);
- if (ret->map == (char *)-1) {
- ret->map = NULL;
- }
- }
-#endif
- return ret;
-}
-
-
-char *map_ptr(struct map_struct *map,OFF_T offset,int len)
-{
- int nread = -2;
-
- if (map->map)
- return map->map+offset;
-
- if (len == 0)
- return NULL;
-
- if (len > (map->size-offset))
- len = map->size-offset;
-
- if (offset >= map->p_offset &&
- offset+len <= map->p_offset+map->p_len) {
- return (map->p + (offset - map->p_offset));
- }
-
- len = MAX(len,CHUNK_SIZE);
- if (len > (map->size-offset))
- len = map->size-offset;
-
- if (len > map->p_size) {
- if (map->p) free(map->p);
- map->p = (char *)malloc(len);
- if (!map->p) out_of_memory("map_ptr");
- map->p_size = len;
- }
-
- if (do_lseek(map->fd,offset,SEEK_SET) != offset ||
- (nread=read(map->fd,map->p,len)) != len) {
- rprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
- (int)offset, len, nread, errno);
- exit_cleanup(1);
- }
-
- map->p_offset = offset;
- map->p_len = len;
-
- return map->p;
-}
-
-
-void unmap_file(struct map_struct *map)
-{
-#ifdef HAVE_MMAP
- if (map->map)
- munmap(map->map,map->size);
-#endif
- if (map->p) free(map->p);
- free(map);
-}
-
/* this is taken from CVS */
int piped_child(char **command,int *f_in,int *f_out)
}
-
-/****************************************************************************
-Set a fd into blocking/nonblocking mode. Uses POSIX O_NONBLOCK if available,
-else
-if SYSV use O_NDELAY
-if BSD use FNDELAY
-****************************************************************************/
-int set_blocking(int fd, int set)
-{
- int val;
-#ifdef O_NONBLOCK
-#define FLAG_TO_SET O_NONBLOCK
-#else
-#ifdef SYSV
-#define FLAG_TO_SET O_NDELAY
-#else /* BSD */
-#define FLAG_TO_SET FNDELAY
-#endif
-#endif
-
- if((val = fcntl(fd, F_GETFL, 0)) == -1)
- return -1;
- if(set) /* Turn blocking on - ie. clear nonblock flag */
- val &= ~FLAG_TO_SET;
- else
- val |= FLAG_TO_SET;
- return fcntl( fd, F_SETFL, val);
-#undef FLAG_TO_SET
-}
-
/****************************************************************************
create any necessary directories in fname. Unfortunately we don't know
what perms to give the directory when this is called so we need to rely
d[len] = 0;
}
+/* like strncat but does not 0 fill the buffer and always null
+ terminates (thus it can use maxlen+1 space in d) */
+void strlcat(char *d, char *s, int maxlen)
+{
+ int len1 = strlen(d);
+ int len2 = strlen(s);
+ if (len1+len2 > maxlen) {
+ len2 = maxlen-len1;
+ }
+ if (len2 > 0) {
+ memcpy(d+len1, s, len2);
+ d[len1+len2] = 0;
+ }
+}
+
/* turn a user name into a uid */
int name_to_uid(char *name, uid_t *uid)
{
static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
{
#ifndef HAVE_GLOB
+ if (!*s) s = ".";
argv[*argc] = strdup(s);
(*argc)++;
return;
glob_t globbuf;
int i;
+ if (!*s) s = ".";
+
argv[*argc] = strdup(s);
memset(&globbuf, 0, sizeof(globbuf));
#endif
}
-void glob_expand(char *base, char **argv, int *argc, int maxargs)
+void glob_expand(char *base1, char **argv, int *argc, int maxargs)
{
char *s = argv[*argc];
char *p, *q;
+ char *base = base1;
if (!s || !*s) return;
+ if (strncmp(s, base, strlen(base)) == 0) {
+ s += strlen(base);
+ }
+
s = strdup(s);
if (!s) out_of_memory("glob_expand");
+ base = (char *)malloc(strlen(base1)+3);
+ if (!base) out_of_memory("glob_expand");
+
+ sprintf(base," %s/", base1);
+
q = s;
while ((p = strstr(q,base)) && ((*argc) < maxargs)) {
- if (p != q && *(p-1) == ' ' && p[strlen(base)] == '/') {
- /* split it at this point */
- *(p-1) = 0;
- glob_expand_one(q, argv, argc, maxargs);
- q = p+strlen(base);
- } else {
- q++;
- }
+ /* split it at this point */
+ *p = 0;
+ glob_expand_one(q, argv, argc, maxargs);
+ q = p+strlen(base);
}
if (*q && (*argc < maxargs)) glob_expand_one(q, argv, argc, maxargs);
free(s);
+ free(base);
}
/*******************************************************************
s++;
}
}
+
+/* this is like vsnprintf but the 'n' limit does not include
+ the terminating null. So if you have a 1024 byte buffer then
+ pass 1023 for n */
+int vslprintf(char *str, int n, const char *format, va_list ap)
+{
+#ifdef HAVE_VSNPRINTF
+ int ret = vsnprintf(str, n, format, ap);
+ if (ret > n || ret < 0) {
+ str[n] = 0;
+ return -1;
+ }
+ str[ret] = 0;
+ return ret;
+#else
+ static char *buf;
+ static int len=MAXPATHLEN*8;
+ int ret;
+
+ /* this code is NOT a proper vsnprintf() implementation. It
+ relies on the fact that all calls to slprintf() in rsync
+ pass strings which have already been checked to be less
+ than MAXPATHLEN in length and never more than 2 strings are
+ concatenated. This means the above buffer is absolutely
+ ample and can never be overflowed.
+
+ In the future we would like to replace this with a proper
+ vsnprintf() implementation but right now we need a solution
+ that is secure and portable. This is it. */
+
+ if (!buf) {
+ buf = malloc(len);
+ if (!buf) {
+ /* can't call debug or we would recurse */
+ exit_cleanup(1);
+ }
+ }
+
+ vsprintf(buf, format, ap);
+ ret = strlen(buf);
+ if (ret > n) {
+ /* yikes! */
+ exit_cleanup(1);
+ }
+ buf[ret] = 0;
+
+ memcpy(str, buf, ret+1);
+
+ return ret;
+#endif
+}
+
+
+/* like snprintf but always null terminates */
+int slprintf(char *str, int n, char *format, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, format);
+ ret = vslprintf(str,n,format,ap);
+ va_end(ap);
+ return ret;
+}
+
+
+void *Realloc(void *p, int size)
+{
+ if (!p) return (void *)malloc(size);
+ return (void *)realloc(p, size);
+}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff