155 |
|
file_name[x] = '\0'; |
156 |
|
if (strcmp(file_name, temp_name) == 0) { |
157 |
|
if (sg_update_string(&svr_name, |
158 |
< |
dp->d_name) < 0) { |
158 |
> |
dp->d_name) < 0) { |
159 |
|
return NULL; |
160 |
|
} |
161 |
|
closedir(dirp); |
337 |
|
* Returns strlen(src); if retval >= siz, truncation occurred. |
338 |
|
*/ |
339 |
|
size_t sg_strlcpy(char *dst, const char *src, size_t siz){ |
340 |
< |
register char *d = dst; |
341 |
< |
register const char *s = src; |
342 |
< |
register size_t n = siz; |
340 |
> |
register char *d = dst; |
341 |
> |
register const char *s = src; |
342 |
> |
register size_t n = siz; |
343 |
|
|
344 |
< |
/* Copy as many bytes as will fit */ |
345 |
< |
if (n != 0 && --n != 0) { |
346 |
< |
do { |
347 |
< |
if ((*d++ = *s++) == 0) |
348 |
< |
break; |
349 |
< |
} while (--n != 0); |
350 |
< |
} |
344 |
> |
/* Copy as many bytes as will fit */ |
345 |
> |
if (n != 0 && --n != 0) { |
346 |
> |
do { |
347 |
> |
if ((*d++ = *s++) == 0) |
348 |
> |
break; |
349 |
> |
} while (--n != 0); |
350 |
> |
} |
351 |
|
|
352 |
< |
/* Not enough room in dst, add NUL and traverse rest of src */ |
353 |
< |
if (n == 0) { |
354 |
< |
if (siz != 0) |
355 |
< |
*d = '\0'; /* NUL-terminate dst */ |
356 |
< |
while (*s++) |
357 |
< |
; |
358 |
< |
} |
352 |
> |
/* Not enough room in dst, add NUL and traverse rest of src */ |
353 |
> |
if (n == 0) { |
354 |
> |
if (siz != 0) |
355 |
> |
*d = '\0'; /* NUL-terminate dst */ |
356 |
> |
while (*s++) |
357 |
> |
; |
358 |
> |
} |
359 |
|
|
360 |
< |
return(s - src - 1); /* count does not include NUL */ |
360 |
> |
return(s - src - 1); /* count does not include NUL */ |
361 |
|
} |
362 |
|
|
363 |
|
/* $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $ */ |
386 |
|
* If retval >= siz, truncation occurred. |
387 |
|
*/ |
388 |
|
size_t sg_strlcat(char *dst, const char *src, size_t siz){ |
389 |
< |
register char *d = dst; |
390 |
< |
register const char *s = src; |
391 |
< |
register size_t n = siz; |
392 |
< |
size_t dlen; |
389 |
> |
register char *d = dst; |
390 |
> |
register const char *s = src; |
391 |
> |
register size_t n = siz; |
392 |
> |
size_t dlen; |
393 |
|
|
394 |
< |
/* Find the end of dst and adjust bytes left but don't go past end */ |
395 |
< |
while (n-- != 0 && *d != '\0') |
396 |
< |
d++; |
397 |
< |
dlen = d - dst; |
398 |
< |
n = siz - dlen; |
394 |
> |
/* Find the end of dst and adjust bytes left but don't go past end */ |
395 |
> |
while (n-- != 0 && *d != '\0') |
396 |
> |
d++; |
397 |
> |
dlen = d - dst; |
398 |
> |
n = siz - dlen; |
399 |
|
|
400 |
< |
if (n == 0) |
401 |
< |
return(dlen + strlen(s)); |
402 |
< |
while (*s != '\0') { |
403 |
< |
if (n != 1) { |
404 |
< |
*d++ = *s; |
405 |
< |
n--; |
406 |
< |
} |
407 |
< |
s++; |
408 |
< |
} |
409 |
< |
*d = '\0'; |
400 |
> |
if (n == 0) |
401 |
> |
return(dlen + strlen(s)); |
402 |
> |
while (*s != '\0') { |
403 |
> |
if (n != 1) { |
404 |
> |
*d++ = *s; |
405 |
> |
n--; |
406 |
> |
} |
407 |
> |
s++; |
408 |
> |
} |
409 |
> |
*d = '\0'; |
410 |
|
|
411 |
< |
return(dlen + (s - src)); /* count does not include NUL */ |
411 |
> |
return(dlen + (s - src)); /* count does not include NUL */ |
412 |
|
} |
413 |
|
|
414 |
|
int sg_update_string(char **dest, const char *src) { |