mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

lib/vfs/utilvfs.c: clean up, fix coding style.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-04-23 12:44:14 +03:00
parent b4cf765748
commit 30e64b5f4c
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/vfs/utilvfs.c
View File

@ -40,7 +40,6 @@
#include "lib/global.h" #include "lib/global.h"
#include "lib/unixcompat.h" #include "lib/unixcompat.h"
#include "lib/util.h" /* mc_mkstemps() */
#include "lib/widget.h" /* message() */ #include "lib/widget.h" /* message() */
#include "lib/strutil.h" /* INVALID_CONV */ #include "lib/strutil.h" /* INVALID_CONV */
@ -67,12 +66,14 @@
/*** file scope type declarations ****************************************************************/ /*** file scope type declarations ****************************************************************/
/*** forward declarations (file scope functions) *************************************************/
/*** file scope variables ************************************************************************/ /*** file scope variables ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/*** file scope functions ************************************************************************/ /*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/ /*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -89,7 +90,8 @@ vfs_get_local_username (void)
p_i = getpwuid (geteuid ()); p_i = getpwuid (geteuid ());
return (p_i && p_i->pw_name) ? g_strdup (p_i->pw_name) : g_strdup ("anonymous"); /* Unknown UID, strange */ /* Unknown UID, strange */
return (p_i != NULL && p_i->pw_name != NULL) ? g_strdup (p_i->pw_name) : g_strdup ("anonymous");
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -100,8 +102,6 @@ vfs_get_local_username (void)
* reasonable. * reasonable.
*/ */
/* --------------------------------------------------------------------------------------------- */
int int
vfs_finduid (const char *uname) vfs_finduid (const char *uname)
{ {
@ -119,10 +119,8 @@ vfs_finduid (const char *uname)
g_strlcpy (saveuname, uname, TUNMLEN); g_strlcpy (saveuname, uname, TUNMLEN);
pw = getpwnam (uname); pw = getpwnam (uname);
if (pw) if (pw != NULL)
{
saveuid = pw->pw_uid; saveuid = pw->pw_uid;
}
else else
{ {
static int my_uid = GUID_DEFAULT_CONST; static int my_uid = GUID_DEFAULT_CONST;
@ -133,6 +131,7 @@ vfs_finduid (const char *uname)
saveuid = my_uid; saveuid = my_uid;
} }
} }
return saveuid; return saveuid;
} }
@ -155,10 +154,8 @@ vfs_findgid (const char *gname)
g_strlcpy (savegname, gname, TGNMLEN); g_strlcpy (savegname, gname, TGNMLEN);
gr = getgrnam (gname); gr = getgrnam (gname);
if (gr) if (gr != NULL)
{
savegid = gr->gr_gid; savegid = gr->gr_gid;
}
else else
{ {
static int my_gid = GUID_DEFAULT_CONST; static int my_gid = GUID_DEFAULT_CONST;
@ -169,6 +166,7 @@ vfs_findgid (const char *gname)
savegid = my_gid; savegid = my_gid;
} }
} }
return savegid; return savegid;
} }