head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.42 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.40 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.38 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.36 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.34 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.32 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.30 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.28 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.26 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.24 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.22 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.20 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.18 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.16 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.14 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.12 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.10 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.8 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.6 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.4 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.2 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.3.0.72 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.70 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.66 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.46 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.68 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.64 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.62 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.60 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.58 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.56 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.54 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.52 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.50 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.48 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.44 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.42 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.40 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.38 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.36 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.34 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.32 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.30 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.28 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.26 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.24 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.22 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.20 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.18 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.16 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.14 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.10 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.6 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.4 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.2.0.78 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.76 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.74 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.72 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.70 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.68 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.66 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.64 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.62 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2021.01.30.18.42.47; author rillig; state Exp; branches; next 1.3; commitid DADdfBfHYLcxvMFC; 1.3 date 2012.01.20.17.06.52; author joerg; state Exp; branches; next 1.2; 1.2 date 98.11.12.23.34.32; author frueauf; state Exp; branches; next 1.1; 1.1 date 98.08.16.22.31.45; author tron; state Exp; branches; next ; desc @@ 1.4 log @games/xpipeman: fix buffer overflow when starting the game @ text @$NetBSD: patch-ad,v 1.3 2012/01/20 17:06:52 joerg Exp $ --- main.c.orig 1991-09-13 20:32:10.000000000 +0000 +++ main.c @@@@ -52,6 +52,9 @@@@ #include #endif +#include +#include +#include #include "xpipeman.h" @@@@ -138,9 +141,7 @@@@ static XtActionsRec actions[] = { {"do_nothing",(XtActionProc)do_nothing_action}, }; -Pixel fg, bg; - -XtTranslations translations; +AppData app_data; static XrmOptionDescRec options[] = { {"-scorefile","scorefile",XrmoptionSepArg, NULL }, @@@@ -148,19 +149,20 @@@@ static XrmOptionDescRec options[] = { static XtResource application_resources[] = { {"foreground", "Foreground", XtRPixel, sizeof(Pixel), - (Cardinal)&fg, XtRString, (caddr_t) "Black"}, + XtOffsetOf(AppData,fg), XtRString, (caddr_t) "Black"}, {"background", "Background", XtRPixel, sizeof(Pixel), - (Cardinal)&bg, XtRString, (caddr_t) "White"}, + XtOffsetOf(AppData,bg), XtRString, (caddr_t) "White"}, {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations), - (Cardinal)&translations, XtRString, (caddr_t)translations_str}, + XtOffsetOf(AppData,translations), XtRString,(caddr_t)translations_str}, {"scorefile","Scorefile", XtRString, sizeof(String), - (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE}, + XtOffsetOf(AppData,score_filename), XtRString,(caddr_t)SCORE_FILE}, }; /*----------------------------------------------------------------------*/ +int main(argc, argv) - unsigned int argc; + int argc; char **argv; { Arg args[1]; @@@@ -177,7 +179,7 @@@@ main(argc, argv) XtAddActions(actions,XtNumber(actions)); - XtGetApplicationResources(top_shell, 0, application_resources, + XtGetApplicationResources(top_shell, &app_data, application_resources, XtNumber(application_resources), NULL, 0 ); top_widget = XtCreateManagedWidget( @@@@ -193,7 +195,7 @@@@ main(argc, argv) arglistplayfield, XtNumber(arglistplayfield)); - XtAugmentTranslations(playfield_widget,translations); + XtAugmentTranslations(playfield_widget,app_data.translations); quit_command = XtCreateManagedWidget( "quit_button", @@@@ -263,12 +265,12 @@@@ main(argc, argv) display = XtDisplay(playfield_widget); playfield = XtWindow(playfield_widget); - gcv.foreground = fg; - gcv.background = bg; + gcv.foreground = app_data.fg; + gcv.background = app_data.bg; gcv.function = GXcopy; gc = XCreateGC(display, playfield, GCForeground | GCBackground | GCFunction, &gcv); - gcv.foreground = bg; + gcv.foreground = app_data.bg; cleargc = XCreateGC(display, playfield, GCForeground | GCBackground | GCFunction, &gcv); @@@@ -318,7 +320,7 @@@@ void update_remain(score) int score; { - char text[13]; + char text[16]; (void)sprintf(text,"Remaining: %4d",score); XtSetArg(arglistremain_command[0],XtNlabel,text); XtSetValues(remain_command,arglistremain_command,1); @ 1.3 log @Don't return without value in non-void functions. Fix main to return int. @ text @d1 1 a1 1 $NetBSD$ d86 9 @ 1.2 log @Some more for pkglint. @ text @d3 13 a15 3 --- main.c.orig Fri Sep 13 22:32:10 1991 +++ main.c Mon Aug 17 00:20:12 1998 @@@@ -138,9 +138,7 @@@@ d26 1 a26 1 @@@@ -148,13 +146,13 @@@@ d44 9 a52 1 @@@@ -177,7 +175,7 @@@@ d61 1 a61 1 @@@@ -193,7 +191,7 @@@@ d70 1 a70 1 @@@@ -263,12 +261,12 @@@@ @ 1.1 log @Make "xpipeman" work under alpha, patches supplied by Tim Rightnour in PR pkg/5943. @ text @d1 2 @