Date: Tue, 10 Feb 2026 15:41:01 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Kristofer Peterson <kris@tranception.com> Subject: git: 003fed6b7b15 - main - games/xpipeman: use portable fileno() instead of (*FILE)->_file Message-ID: <698b518d.46c40.327cf3b9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=003fed6b7b152ddf56b71d18380432a9b24f5b06 commit 003fed6b7b152ddf56b71d18380432a9b24f5b06 Author: Kristofer Peterson <kris@tranception.com> AuthorDate: 2026-02-04 20:24:55 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-02-10 15:40:36 +0000 games/xpipeman: use portable fileno() instead of (*FILE)->_file PR: 292939, 291610 MFH: 2026Q1 --- games/xpipeman/Makefile | 2 +- games/xpipeman/files/patch-score.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index 32e0873a229f..a99d2f1cf02e 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -1,6 +1,6 @@ PORTNAME= xpipeman PORTVERSION= 1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SUNSITE/games/strategy DISTNAME= ${PORTNAME} diff --git a/games/xpipeman/files/patch-score.c b/games/xpipeman/files/patch-score.c index fe30359ded31..c1334f3773f6 100644 --- a/games/xpipeman/files/patch-score.c +++ b/games/xpipeman/files/patch-score.c @@ -11,7 +11,7 @@ #include "xpipeman.h" /*----------------------------------------------------------------------*/ -@@ -64,13 +65,12 @@ typedef struct { +@@ -64,13 +65,12 @@ static SCORE scores[MAXSCORES]; static SCORE scores[MAXSCORES]; @@ -26,7 +26,16 @@ /*----------------------------------------------------------------------*/ -@@ -100,8 +100,8 @@ load_scores() +@@ -87,7 +87,7 @@ check_score(current_score,level) + } + if(scorefile) { + #ifndef SYSV +- flock(scorefile->_file, LOCK_UN); ++ flock(fileno(scorefile), LOCK_UN); + #endif + fclose(scorefile); + show_scores(); +@@ -100,12 +100,12 @@ load_scores() { int i = 0; @@ -37,6 +46,11 @@ return; } #ifndef SYSV +- flock(scorefile->_file, LOCK_EX); ++ flock(fileno(scorefile), LOCK_EX); + #endif + while( fgets(scores[i].score,6,scorefile) /* get score */ + && fgets(scores[i].name,26,scorefile) /* get name */ @@ -198,7 +198,7 @@ static Arg arglist_popdown[] = { @@ -46,3 +60,12 @@ popdown_callback(w, closure, call_data) Widget w; caddr_t closure; +@@ -281,7 +281,7 @@ show_scores_callback() + + if(scorefile) { + #ifndef SYSV +- flock(scorefile->_file, LOCK_UN); ++ flock(fileno(scorefile), LOCK_UN); + #endif + fclose(scorefile); + show_scores();home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698b518d.46c40.327cf3b9>