head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.134 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.132 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.130 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.128 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.126 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.124 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.122 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.120 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.118 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.116 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.114 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.112 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.110 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.108 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.106 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.104 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.102 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.100 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.98 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.96 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.94 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.92 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.90 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.86 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.66 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.88 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.84 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.82 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.80 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.78 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.76 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.74 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.72 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.70 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.68 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.64 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.62 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.60 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.58 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.56 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.54 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.52 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.50 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.48 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.46 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.44 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.42 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.40 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.38 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.36 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.34 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.32 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.30 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.28 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.26 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.24 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.22 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.20 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.18 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.16 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.14 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.12 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.10 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.8 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.6 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.4 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.2 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.1.1.1.0.2 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2009.09.28.11.29.32; author martin; state Exp; branches; next 1.1; 1.1 date 2009.04.08.16.31.56; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.04.08.16.31.56; author drochner; state Exp; branches; next ; desc @@ 1.2 log @Rename getline() to scoregetline() to avoid a conflict on NetBSD-current @ text @$NetBSD: patch-ah,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ --- score.c.orig 1996-08-27 21:23:58.000000000 +0200 +++ score.c 2009-09-28 13:15:32.000000000 +0200 @@@@ -633,10 +633,11 @@@@ static short WriteScore() char tempfile[MAXPATHLEN]; strcpy(tempfile, tempnm); - (void)mktemp(tempfile); - scorefile = fopen(tempfile, "w"); + sfdbn = mkstemp(tempfile); + if (sfdbn < 0) + return E_FOPENSCORE; + scorefile = fdopen(sfdbn, "w"); if (!scorefile) return E_FOPENSCORE; - sfdbn = fileno(scorefile); scoreentries = htons(scoreentries); if (fwrite(SCORE_VERSION, 4, 1, scorefile) != 1) { @@@@ -797,7 +798,7 @@@@ static void CopyEntry(short i1, short i2 } /* Extract one line from "text". Return 0 if there is no line to extract. */ -char *getline(char *text, char *linebuf, int bufsiz) +char *scoregetline(char *text, char *linebuf, int bufsiz) { if (*text == 0) { *linebuf = 0; @@@@ -938,7 +939,7 @@@@ char *skip_past_header(char *text) { char line[256]; do { - text = getline(text, line, sizeof(line)); + text = scoregetline(text, line, sizeof(line)); if (!text) return 0; } while (0 != strcmp(line, "")); return text; @@@@ -982,7 +983,7 @@@@ static short ParseUserLevel(char *text, char line[256]; text = skip_past_header(text); if (!text) return E_READSCORE; - text = getline(text, line, sizeof(line)); + text = scoregetline(text, line, sizeof(line)); if (!text) return E_READSCORE; if (0 == strncmp(line, "Level: ", 7)) { *lv = atoi(&line[7]); @@@@ -999,7 +1000,7 @@@@ static void DeleteAllEntries() } #define GRAB(tag, stmt) \ - text = getline(text, line, sizeof(line)); \ + text = scoregetline(text, line, sizeof(line)); \ if (!text) return E_READSCORE; \ if (0 == strncmp(line, tag, strlen(tag))) { stmt; } \ else return E_READSCORE; @@@@ -1070,7 +1071,7 @@@@ static short ParseScoreText(char *text, { char line[256]; do { - text = getline(text, line, sizeof(line)); + text = scoregetline(text, line, sizeof(line)); if (!text) return E_READSCORE; } while (line[0] != '='); scoreentries = 0; @@@@ -1091,7 +1092,7 @@@@ static short ParseScoreLine(int i, char int rank; char rank_s[4]; char line[256]; - *text = getline(*text, line, sizeof(line)); + *text = scoregetline(*text, line, sizeof(line)); if (!*text) return 0; strncpy(rank_s, line, 4); rank = atoi(rank_s); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ score.c d20 54 @ 1.1.1.1 log @add xsokoban-3.3c, from Aleksey Cheusov per pkgsrc-wip @ text @@