- Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS - Added a driver for the POLDI power supplies SKIPPED: psi/A1931.c psi/autowin.c psi/bruker.c psi/docho.c psi/dornier2.c psi/dspcode.c psi/ease.c psi/ecb.c psi/ecbcounter.c psi/ecbdriv.c psi/el734dc.c psi/el734driv.c psi/el734hp.c psi/el737driv.c psi/el737hpdriv.c psi/el737hpdrivsps.c psi/el737hpv2driv.c psi/el755driv.c psi/eurodriv.c psi/haakedriv.c psi/itc4driv.c psi/julcho.c psi/linadriv.c psi/lmd200.c psi/lscsupport.c psi/ltc11.c psi/make_gen psi/oicom.c psi/oxinst.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/sanscook.c psi/sanslirebin.c psi/sanswave.c psi/sinqhmdriv.c psi/sinqhttp.c psi/slsecho.c psi/slsmagnet.c psi/slsvme.c psi/sps.c psi/swmotor.c psi/swmotor2.c psi/tabledrive.c psi/tasscan.c psi/tdchm.c psi/velodorn.c psi/velodornier.c
This commit is contained in:
8
help.c
8
help.c
@ -45,7 +45,7 @@ static FILE *findHelpFile(char *name)
|
||||
while ((pPtr = stptok(pPtr, dir, 131, PATHSEP)) != NULL) {
|
||||
strcpy(pBueffel, dir);
|
||||
strcat(pBueffel, DIRSEP);
|
||||
strncat(pBueffel, name, (254 - strlen(pBueffel)));
|
||||
strlcat(pBueffel, name, (254 - strlen(pBueffel)));
|
||||
fd = fopen(pBueffel, "r");
|
||||
if (fd != NULL) {
|
||||
return fd;
|
||||
@ -117,7 +117,7 @@ int SicsHelp(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
char helpFile[256];
|
||||
FILE *fd = NULL;
|
||||
|
||||
strncpy(helpFile, defaultFile, 255);
|
||||
strlcpy(helpFile, defaultFile, 255);
|
||||
|
||||
if (argc > 1) {
|
||||
strtolower(argv[1]);
|
||||
@ -140,8 +140,8 @@ int SicsHelp(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
/*
|
||||
the parameter is a help file name
|
||||
*/
|
||||
strncpy(helpFile, argv[1], 255);
|
||||
strncat(helpFile, ".txt", 255);
|
||||
strlcpy(helpFile, argv[1], 255);
|
||||
strlcat(helpFile, ".txt", 255);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user