mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
(PASSWD_FIELD_SIZE): Defined.
(the_passwd_name, the_passwd_passwd, the_passwd_gecos, the_passwd_dir, the_passwd_shell, getpwuid): Use PASSWD_FIELD_SIZE. (get_emacs_configuration): Check if processor macros are defined.
This commit is contained in:
parent
7a8b824c1e
commit
051fe60dc4
27
src/w32.c
27
src/w32.c
@ -206,11 +206,13 @@ readdir (DIR *dirp)
|
||||
|
||||
int getuid (); /* forward declaration */
|
||||
|
||||
static char the_passwd_name[256];
|
||||
static char the_passwd_passwd[256];
|
||||
static char the_passwd_gecos[256];
|
||||
static char the_passwd_dir[256];
|
||||
static char the_passwd_shell[256];
|
||||
#define PASSWD_FIELD_SIZE 256
|
||||
|
||||
static char the_passwd_name[PASSWD_FIELD_SIZE];
|
||||
static char the_passwd_passwd[PASSWD_FIELD_SIZE];
|
||||
static char the_passwd_gecos[PASSWD_FIELD_SIZE];
|
||||
static char the_passwd_dir[PASSWD_FIELD_SIZE];
|
||||
static char the_passwd_shell[PASSWD_FIELD_SIZE];
|
||||
|
||||
static struct passwd the_passwd =
|
||||
{
|
||||
@ -227,7 +229,7 @@ static struct passwd the_passwd =
|
||||
struct passwd *
|
||||
getpwuid (int uid)
|
||||
{
|
||||
int size = 256;
|
||||
int size = PASSWD_FIELD_SIZE;
|
||||
|
||||
if (!GetUserName (the_passwd.pw_name, &size))
|
||||
return NULL;
|
||||
@ -273,22 +275,35 @@ get_emacs_configuration (void)
|
||||
/* Determine the processor type. */
|
||||
switch (get_processor_type ())
|
||||
{
|
||||
|
||||
#ifdef PROCESSOR_INTEL_386
|
||||
case PROCESSOR_INTEL_386:
|
||||
case PROCESSOR_INTEL_486:
|
||||
case PROCESSOR_INTEL_PENTIUM:
|
||||
arch = "i386";
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef PROCESSOR_INTEL_860
|
||||
case PROCESSOR_INTEL_860:
|
||||
arch = "i860";
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef PROCESSOR_MIPS_R2000
|
||||
case PROCESSOR_MIPS_R2000:
|
||||
case PROCESSOR_MIPS_R3000:
|
||||
case PROCESSOR_MIPS_R4000:
|
||||
arch = "mips";
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef PROCESSOR_ALPHA_21064
|
||||
case PROCESSOR_ALPHA_21064:
|
||||
arch = "alpha";
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
arch = "unknown";
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user