emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/isexpired.c: Added parenthesis.

Browse Source 
* libmisc/env.c: Added comments.
	* libmisc/env.c: Avoid implicit conversion of pointer to boolean.
This commit is contained in:
nekral-guest 2011-06-16 21:25:36 +00:00
parent 907025eb40
commit 75f4b049a6
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-16 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/isexpired.c: Added parenthesis.
* libmisc/env.c: Added comments.
* libmisc/env.c: Avoid implicit conversion of pointer to boolean.
2011-06-16 Nicolas François <nicolas.francois@centraliens.net> 2011-06-16 Nicolas François <nicolas.francois@centraliens.net>
* src/su.c: environ is provided by <unistd.h>. * src/su.c: environ is provided by <unistd.h>.

14
libmisc/env.c
View File

@ -115,6 +115,9 @@ void addenv (const char *string, /*@null@*/const char *value)
n = (size_t) (cp - newstring); n = (size_t) (cp - newstring);
/*
* If this environment variable is already set, change its value.
*/
for (i = 0; i < newenvc; i++) { for (i = 0; i < newenvc; i++) {
if ( (strncmp (newstring, newenvp[i], n) == 0) if ( (strncmp (newstring, newenvp[i], n) == 0)
&& (('=' == newenvp[i][n]) || ('\0' == newenvp[i][n]))) { && (('=' == newenvp[i][n]) || ('\0' == newenvp[i][n]))) {
@ -128,8 +131,15 @@ void addenv (const char *string, /*@null@*/const char *value)
return; return;
} }
/*
* Otherwise, save the new environment variable
*/
newenvp[newenvc++] = newstring; newenvp[newenvc++] = newstring;
/*
* And extend the environment if needed.
*/
/* /*
* Check whether newenvc is a multiple of NEWENVP_STEP. * Check whether newenvc is a multiple of NEWENVP_STEP.
* If so we have to resize the vector. * If so we have to resize the vector.
@ -143,14 +153,14 @@ void addenv (const char *string, /*@null@*/const char *value)
size_t newsize; size_t newsize;
/* /*
* If the resize operation succeds we can * If the resize operation succeeds we can
* happily go on, else print a message. * happily go on, else print a message.
*/ */
newsize = (newenvc + NEWENVP_STEP) * sizeof (char *); newsize = (newenvc + NEWENVP_STEP) * sizeof (char *);
__newenvp = (char **) realloc (newenvp, newsize); __newenvp = (char **) realloc (newenvp, newsize);
if (__newenvp) { if (NULL != __newenvp) {
/* /*
* If this is our current environment, update * If this is our current environment, update
* environ so that it doesn't point to some * environ so that it doesn't point to some

2
libmisc/isexpired.c
View File

@ -107,7 +107,7 @@ int isexpired (const struct passwd *pw, /*@null@*/const struct spwd *sp)
if ( (-1 == sp->sp_lstchg) if ( (-1 == sp->sp_lstchg)
|| (-1 == sp->sp_max) || (-1 == sp->sp_max)
|| (sp->sp_max >= (10000L * DAY / SCALE))) { || (sp->sp_max >= ((10000L * DAY) / SCALE))) {
return 0; return 0;
} }