mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* names.c: Only leave actually used functions.

This commit is contained in:
Pavel Roskin 2002-11-15 06:19:34 +00:00
parent 6b2d184d9e
commit dc724cdb6e
3 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vfs/ChangeLog
View File

@ -1,5 +1,7 @@
2002-11-15 Pavel Roskin <proski@gnu.org>
* names.c: Only leave actually used functions.
* ftpfs.c (ftpfs_open_socket): Use INADDR_NONE, not -1.
2002-11-12 Pavel Roskin <proski@gnu.org>

61
vfs/names.c
View File

@ -17,8 +17,9 @@ GNU Library General Public License for more details.
*/
/*
* Look up user and/or group names.
*
* Look up a user or group name from a uid/gid, maintaining a cache.
* FIXME, for now it's a one-entry cache.
* FIXME2, the "-993" is to reduce the chance of a hit on the first lookup.
* This file should be modified for non-unix systems to do something
* reasonable.
*/
@ -27,15 +28,13 @@ GNU Library General Public License for more details.
#include <sys/types.h>
#include <string.h>
#include <unistd.h>
#define TAR_NAMES
#include "tar.h"
#include "names.h"
#include <stdio.h>
#include <pwd.h>
#include <grp.h>
#ifndef TUNMLEN
#include "names.h"
#ifndef TUNMLEN
#define TUNMLEN 256
#endif
#ifndef TGNMLEN
@ -53,31 +52,12 @@ static int my_gid = -993;
#define myuid ( my_uid < 0? (my_uid = getuid()): my_uid )
#define mygid ( my_gid < 0? (my_gid = getgid()): my_gid )
/*
* Look up a user or group name from a uid/gid, maintaining a cache.
* FIXME, for now it's a one-entry cache.
* FIXME2, the "-993" is to reduce the chance of a hit on the first lookup.
*/
void finduname (char *uname, int uid)
int
finduid (char *uname)
{
struct passwd *pw;
if (uid != saveuid) {
saveuid = uid;
saveuname[0] = '\0';
pw = getpwuid (uid);
if (pw)
strncpy (saveuname, pw->pw_name, TUNMLEN);
}
strncpy (uname, saveuname, TUNMLEN);
}
int finduid (char *uname)
{
struct passwd *pw;
extern struct passwd *getpwnam ();
if (uname[0] != saveuname[0]/* Quick test w/o proc call */
if (uname[0] != saveuname[0] /* Quick test w/o proc call */
||0 != strncmp (uname, saveuname, TUNMLEN)) {
strncpy (saveuname, uname, TUNMLEN);
pw = getpwnam (uname);
@ -90,29 +70,12 @@ int finduid (char *uname)
return saveuid;
}
void findgname (char *gname, int gid)
int
findgid (char *gname)
{
struct group *gr;
if (gid != savegid) {
savegid = gid;
savegname[0] = '\0';
(void) setgrent ();
gr = getgrgid (gid);
if (gr)
strncpy (savegname, gr->gr_name, TGNMLEN);
}
(void) strncpy (gname, savegname, TGNMLEN);
}
int findgid (char *gname)
{
struct group *gr;
extern struct group *getgrnam ();
if (gname[0] != savegname[0]/* Quick test w/o proc call */
if (gname[0] != savegname[0] /* Quick test w/o proc call */
||0 != strncmp (gname, savegname, TUNMLEN)) {
strncpy (savegname, gname, TUNMLEN);
gr = getgrnam (gname);

7
vfs/names.h
View File

@ -1,4 +1,7 @@
#ifndef __NAMES_H
#define __NAMES_H
int finduid (char *name);
void finduname (char *name, int uid);
int findgid (char *name);
void findgname (char *name, int gid);
#endif /* __NAMES_H */