c39305569b
Except for the added (and sorted) includes, the removal of redundant parentheses, and a few non-string cases that I've left out of the change, this patch can be approximated with the following semantic patch: $ cat ~/tmp/spatch/strneq.sp @@ expression s; @@ - '\0' != *s + !streq(s, "") @@ expression s; @@ - '\0' != s[0] + !streq(s, "") @@ expression s; @@ - *s != '\0' + !streq(s, "") @@ expression s; @@ - s[0] != '\0' + !streq(s, "") $ find contrib/ lib* src/ -type f \ | xargs spatch --in-place --sp-file ~/tmp/spatch/strneq.sp; Signed-off-by: Alejandro Colomar <alx@kernel.org>
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
/*
|
|
* myname.c - determine the current username and get the passwd entry
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include <pwd.h>
|
|
|
|
#include "defines.h"
|
|
#include "prototypes.h"
|
|
#include "string/strcmp/streq.h"
|
|
|
|
|
|
/*@null@*/ /*@only@*/struct passwd *get_my_pwent (void)
|
|
{
|
|
struct passwd *pw;
|
|
const char *cp = getlogin ();
|
|
uid_t ruid = getuid ();
|
|
|
|
/*
|
|
* Try getlogin() first - if it fails or returns a non-existent
|
|
* username, or a username which doesn't match the real UID, fall
|
|
* back to getpwuid(getuid()). This should work reasonably with
|
|
* usernames longer than the utmp limit (8 characters), as well as
|
|
* shared UIDs - but not both at the same time...
|
|
*
|
|
* XXX - when running from su, will return the current user (not
|
|
* the original user, like getlogin() does). Does this matter?
|
|
*/
|
|
if ((NULL != cp) && !streq(cp, "")) {
|
|
pw = xgetpwnam (cp);
|
|
if ((NULL != pw) && (pw->pw_uid == ruid)) {
|
|
return pw;
|
|
}
|
|
if (NULL != pw) {
|
|
pw_free (pw);
|
|
}
|
|
}
|
|
|
|
return xgetpwuid (ruid);
|
|
}
|
|
|