oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

large strc{py,at}_truncate -> strlc{py,at} replacement

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6984 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-09-16 20:41:57 +00:00
parent 8e441f1158
commit bf75fac82a
42 changed files with 176 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/auth/pam/pam.c
View File

@@ -150,10 +150,10 @@ auth_su(pam_handle_t *pamh, int flags, char *user, struct pam_conv *conv)
pw = getpwuid(getuid());
if(strcmp(user, "root") == 0){
strcpy_truncate(pr.name, pw->pw_name, sizeof(pr.name));
strcpy_truncate(pr.instance, "root", sizeof(pr.instance));
strlcpy(pr.name, pw->pw_name, sizeof(pr.name));
strlcpy(pr.instance, "root", sizeof(pr.instance));
}else{
strcpy_truncate(pr.name, user, sizeof(pr.name));
strlcpy(pr.name, user, sizeof(pr.name));
pr.instance[0] = 0;
}
pmsg = &msg;

8
lib/com_err/Makefile.in
View File

@@ -141,10 +141,10 @@ lex.c: $(srcdir)/lex.l
snprintf.c:
$(LN_S) $(srcdir)/../roken/snprintf.c .
strcat_truncate.c:
$(LN_S) $(srcdir)/../roken/strcat_truncate.c .
strlcat.c:
$(LN_S) $(srcdir)/../roken/strlcat.c .
strcpy_truncate.c:
$(LN_S) $(srcdir)/../roken/strcpy_truncate.c .
strlcpy.c:
$(LN_S) $(srcdir)/../roken/strlcpy.c .
.PHONY: all Wall install uninstall clean mostlyclean distclean realclean

2
lib/des/passwd_dlg.c
View File

@@ -84,7 +84,7 @@ pwd_dialog(char *buf, int size)
switch(DialogBox(hInst,MAKEINTRESOURCE(IDD_PASSWD_DIALOG),wnd,pwd_dialog_proc))
{
case IDOK:
strcpy_truncate(buf, passwd, size);
strlcpy(buf, passwd, size);
memset (passwd, 0, sizeof(passwd));
return 0;
case IDCANCEL:

12
lib/kafs/Makefile.in
View File

@@ -41,9 +41,9 @@ LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
SOURCES = afssys.c afskrb.c common.c afslib.c
EXTRA_SOURCE = issuid.c strcpy_truncate.c strcat_truncate.c
EXTRA_SOURCE = issuid.c strlcpy.c strlcat.c
EXTRA_OBJECT = issuid.o strcpy_truncate.o strcat_truncate.o
EXTRA_OBJECT = issuid.o strlcpy.o strlcat.o
OBJECTS = afssys.o afskrb.o common.o $(EXTRA_OBJECT) $(AFS_EXTRA_OBJS)
@@ -109,9 +109,9 @@ roken_rename.h:
issuid.c:
$(LN_S) $(srcdir)/../roken/issuid.c .
strcat_truncate.c:
$(LN_S) $(srcdir)/../roken/strcat_truncate.c .
strlcat.c:
$(LN_S) $(srcdir)/../roken/strlcat.c .
strcpy_truncate.c:
$(LN_S) $(srcdir)/../roken/strcpy_truncate.c .
strlcpy.c:
$(LN_S) $(srcdir)/../roken/strlcpy.c .

2
lib/kafs/afssys.c
View File

@@ -77,7 +77,7 @@ try_aix(void)
* If we are root or running setuid don't trust AFSLIBPATH!
*/
if (getuid() != 0 && !issuid() && (p = getenv("AFSLIBPATH")) != NULL)
strcpy_truncate(path, p, sizeof(path));
strlcpy(path, p, sizeof(path));
else
snprintf(path, sizeof(path), "%s/afslib.so", LIBDIR);

2
lib/kafs/common.c
View File

@@ -155,7 +155,7 @@ dns_find_cell(const char *cell, char *dbserver, size_t len)
struct resource_record *rr = r->head;
while(rr){
if(rr->type == T_AFSDB && rr->u.afsdb->preference == 1){
strcpy_truncate(dbserver,
strlcpy(dbserver,
rr->u.afsdb->domain,
len);
ok = 0;

28
lib/kafs/dlfcn.c
View File

@@ -142,7 +142,7 @@ void *dlopen(const char *path, int mode)
if (errno == ENOEXEC) {
char *tmp[BUFSIZ/sizeof(char *)];
if (loadquery(L_GETMESSAGES, tmp, sizeof(tmp)) == -1)
strcpy_truncate(errbuf,
strlcpy(errbuf,
strerror(errno),
sizeof(errbuf));
else {
@@ -151,7 +151,7 @@ void *dlopen(const char *path, int mode)
caterr(*p);
}
} else
strcat_truncate(errbuf,
strlcat(errbuf,
strerror(errno),
sizeof(errbuf));
return NULL;
@@ -231,29 +231,29 @@ static void caterr(char *s)
p++;
switch(atoi(s)) {
case L_ERROR_TOOMANY:
strcat_truncate(errbuf, "to many errors", sizeof(errbuf));
strlcat(errbuf, "to many errors", sizeof(errbuf));
break;
case L_ERROR_NOLIB:
strcat_truncate(errbuf, "can't load library", sizeof(errbuf));
strcat_truncate(errbuf, p, sizeof(errbuf));
strlcat(errbuf, "can't load library", sizeof(errbuf));
strlcat(errbuf, p, sizeof(errbuf));
break;
case L_ERROR_UNDEF:
strcat_truncate(errbuf, "can't find symbol", sizeof(errbuf));
strcat_truncate(errbuf, p, sizeof(errbuf));
strlcat(errbuf, "can't find symbol", sizeof(errbuf));
strlcat(errbuf, p, sizeof(errbuf));
break;
case L_ERROR_RLDBAD:
strcat_truncate(errbuf, "bad RLD", sizeof(errbuf));
strcat_truncate(errbuf, p, sizeof(errbuf));
strlcat(errbuf, "bad RLD", sizeof(errbuf));
strlcat(errbuf, p, sizeof(errbuf));
break;
case L_ERROR_FORMAT:
strcat_truncate(errbuf, "bad exec format in", sizeof(errbuf));
strcat_truncate(errbuf, p, sizeof(errbuf));
strlcat(errbuf, "bad exec format in", sizeof(errbuf));
strlcat(errbuf, p, sizeof(errbuf));
break;
case L_ERROR_ERRNO:
strcat_truncate(errbuf, strerror(atoi(++p)), sizeof(errbuf));
strlcat(errbuf, strerror(atoi(++p)), sizeof(errbuf));
break;
default:
strcat_truncate(errbuf, s, sizeof(errbuf));
strlcat(errbuf, s, sizeof(errbuf));
break;
}
}
@@ -519,7 +519,7 @@ static int readExports(ModulePtr mp)
* must copy the first SYMNMLEN chars and make
* sure we have a zero byte at the end.
*/
strcpy_truncate (tmpsym, ls->l_name,
strlcpy (tmpsym, ls->l_name,
SYMNMLEN + 1);
symname = tmpsym;
}

2
lib/otp/otp_db.c
View File

@@ -145,7 +145,7 @@ otp_get_internal (void *v, OtpContext *ctx, int lockp)
p += 4;
memcpy (ctx->key, p, OTPKEYSIZE);
p += OTPKEYSIZE;
strcpy_truncate (ctx->seed, p, sizeof(ctx->seed));
strlcpy (ctx->seed, p, sizeof(ctx->seed));
if (lockp)
return dbm_store (dbm, key, dat, DBM_REPLACE);
else

4
lib/otp/otp_print.c
View File

@@ -88,7 +88,7 @@ otp_print_hex (OtpKey key, char *str, size_t sz)
void
otp_print_hex_extended (OtpKey key, char *str, size_t sz)
{
strcpy_truncate (str, OTP_HEXPREFIX, sz);
strlcpy (str, OTP_HEXPREFIX, sz);
otp_print_hex (key,
str + strlen(OTP_HEXPREFIX),
sz - strlen(OTP_HEXPREFIX));
@@ -97,7 +97,7 @@ otp_print_hex_extended (OtpKey key, char *str, size_t sz)
void
otp_print_stddict_extended (OtpKey key, char *str, size_t sz)
{
strcpy_truncate (str, OTP_WORDPREFIX, sz);
strlcpy (str, OTP_WORDPREFIX, sz);
otp_print_stddict (key,
str + strlen(OTP_WORDPREFIX),
sz - strlen(OTP_WORDPREFIX));