Module Name: src
Committed By: dholland
Date: Sat Mar 22 23:42:48 UTC 2014
Modified Files:
src/games/canfield/canfield: canfield.c
Log Message:
Use uid_t to hold getuid() results, and don't check getuid for failure
as it isn't allowed to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/canfield/canfield/canfield.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/canfield/canfield/canfield.c
diff -u src/games/canfield/canfield/canfield.c:1.28 src/games/canfield/canfield/canfield.c:1.29
--- src/games/canfield/canfield/canfield.c:1.28 Mon May 23 22:46:35 2011
+++ src/games/canfield/canfield/canfield.c Sat Mar 22 23:42:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: canfield.c,v 1.28 2011/05/23 22:46:35 joerg Exp $ */
+/* $NetBSD: canfield.c,v 1.29 2014/03/22 23:42:48 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)canfield.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: canfield.c,v 1.28 2011/05/23 22:46:35 joerg Exp $");
+__RCSID("$NetBSD: canfield.c,v 1.29 2014/03/22 23:42:48 dholland Exp $");
#endif
#endif /* not lint */
@@ -168,7 +168,7 @@ static bool mtfdone, Cflag = FALSE;
#define BETTINGBOX 2
#define NOBOX 3
static int status = INSTRUCTIONBOX;
-static int uid;
+static uid_t uid;
/*
* Basic betting costs
@@ -1643,8 +1643,6 @@ initall(void)
time(&acctstart);
initdeck(deck);
uid = getuid();
- if (uid < 0)
- uid = 0;
dbfd = open(_PATH_SCORE, O_RDWR);
/* Revoke setgid privileges */
