bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backported fixes for trim() from pacman 2.9.5

Browse source
This commit is contained in:
Aurelien Foret 2005-03-25 21:13:23 +00:00
parent e010e1bba6
commit 6e63ccfd0f
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libalpm/util.c
View file

@ -145,6 +145,11 @@ char *_alpm_strtrim(char *str)
{ {
char *pch = str; char *pch = str;
if(*str == '\0') {
/* string is empty, so we're done. */
return(str);
}
while(isspace(*pch)) { while(isspace(*pch)) {
pch++; pch++;
} }
@ -152,13 +157,18 @@ char *_alpm_strtrim(char *str)
memmove(str, pch, (strlen(pch) + 1)); memmove(str, pch, (strlen(pch) + 1));
} }
/* check if there wasn't anything but whitespace in the string. */
if(*str == '\0') {
return(str);
}
pch = (char*)(str + (strlen(str) - 1)); pch = (char*)(str + (strlen(str) - 1));
while(isspace(*pch)) { while(isspace(*pch)) {
pch--; pch--;
} }
*++pch = '\0'; *++pch = '\0';
return str; return(str);
} }
/* A cheap grep for text files, returns 1 if a substring /* A cheap grep for text files, returns 1 if a substring