fix-joe-beuhler-patches-20031124

minor fixes to Joe Beuhler's NT patches for non-NT
This commit is contained in:
Jim Rees 2003-11-24 22:09:18 +00:00
parent fc7931f4f2
commit ff9c60a3c8
3 changed files with 6 additions and 5 deletions

View File

@ -975,9 +975,10 @@ WorkerBee(as, arock)
if (centralLogFile) { if (centralLogFile) {
struct stat sbuf; struct stat sbuf;
afs_int32 statcode; afs_int32 statcode;
#ifdef AFS_NT40_ENV #ifndef AFS_NT40_ENV
char path[AFSDIR_PATH_MAX]; char path[AFSDIR_PATH_MAX];
#endif #endif
statcode = stat(centralLogFile, &sbuf); statcode = stat(centralLogFile, &sbuf);
centralLogIO = fopen(centralLogFile, "a"); centralLogIO = fopen(centralLogFile, "a");
if (!centralLogIO) { if (!centralLogIO) {

View File

@ -1348,8 +1348,8 @@ MyBeforeProc(struct cmd_syndesc *as, char *arock)
} }
#else #else
/* No explicit name provided: use Unix uid. */ /* No explicit name provided: use Unix uid. */
struct passwd pw = getpwuid(getuid()); struct passwd *pw = getpwuid(getuid());
if (pw == 0) { if (pw == NULL) {
printf("Can't figure out your name from your user id.\n"); printf("Can't figure out your name from your user id.\n");
return KABADCMD; return KABADCMD;
} }

View File

@ -292,7 +292,7 @@ static int FDSetCmp(int nfds, fd_set *fd_set1, fd_set *fd_set2)
*/ */
static void FDSetSet(int nfds, fd_set *fd_set1, fd_set *fd_set2) static void FDSetSet(int nfds, fd_set *fd_set1, fd_set *fd_set2)
{ {
unsigned int i; unsigned int i, n;
if (fd_set1 == (fd_set*)0 || fd_set2 == (fd_set*)0) if (fd_set1 == (fd_set*)0 || fd_set2 == (fd_set*)0)
return; return;
@ -307,7 +307,7 @@ static void FDSetSet(int nfds, fd_set *fd_set1, fd_set *fd_set2)
if (nfds == 0) if (nfds == 0)
return; return;
for (i=0,n = INTS_PER_FDS(nfds); i<n; i++) { for (i = 0, n = INTS_PER_FDS(nfds); i < n; i++) {
fd_set1->FDS_BITS[i] |= fd_set2->FDS_BITS[i]; fd_set1->FDS_BITS[i] |= fd_set2->FDS_BITS[i];
} }
#endif #endif