head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.172 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.170 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.168 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.166 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.164 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.162 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.160 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.158 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.156 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.154 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.152 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.150 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.148 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.146 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.144 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.142 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.140 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.138 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.136 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.134 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.132 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.130 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.128 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.124 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.104 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.126 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.122 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.120 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.118 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.116 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.114 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.112 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.110 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.108 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.106 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.102 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.100 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.98 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.96 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.94 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.92 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.90 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.88 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.86 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.84 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.82 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.80 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.78 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.76 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.74 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.72 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.70 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.68 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.66 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.64 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.62 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.60 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.58 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.56 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.54 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.52 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.50 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.48 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.46 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.44 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.42 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.40 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.38 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.36 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.34 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.32 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.30 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.28 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.26 pkgsrc-2008Q1:1.5.0.24 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.22 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.20 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.18 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.16 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.14 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.12 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.10 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2005.04.23.10.55.59; author jmmv; state Exp; branches; next 1.4; 1.4 date 2005.03.20.12.51.34; author jmmv; state Exp; branches; next 1.3; 1.3 date 2005.03.10.14.07.29; author tv; state Exp; branches; next 1.2; 1.2 date 2004.05.27.22.20.00; author hubertf; state Exp; branches; next 1.1; 1.1 date 99.11.23.04.22.13; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.11.23.04.22.13; author hubertf; state Exp; branches; next ; desc @@ 1.5 log @Fix patch-aa (commited by me a while ago) as it contained a CVS Id string which got replaced at commit time, thus breaking the patch. Noticed by wiz@@. @ text @$NetBSD: patch-aa,v 1.4 2005/03/20 12:51:34 jmmv Exp $ --- fujiplay.c.orig 1999-02-23 10:30:31.000000000 +0100 +++ fujiplay.c 2005-03-20 13:49:59.000000000 +0100 @@@@ -35,7 +35,7 @@@@ #define B115200 EXTB #endif -#define DEFAULT_DEVICE "/dev/fujifilm" +#define DEFAULT_DEVICE "/dev/tty00" #define TMP_PIC_FILE ".dsc_temp" struct pict_info { @@@@ -632,8 +632,8 @@@@ cmd2(0, 0x02, n, fd); t2 = times(&stms); if (t1==t2) t2++; /* paranoia */ - printf("%3d seconds, ", (int)(t2-t1) / CLK_TCK); - printf("%4d bytes/s\n", size * CLK_TCK / (int)(t2-t1)); + printf("%3d seconds, ", (int)((t2-t1) / CLK_TCK)); + printf("%4d bytes/s\n", (int)(size * CLK_TCK / (int)(t2-t1))); fclose(fd); if (stat(TMP_PIC_FILE, &st) < 0 || st.st_size != size) { /* Truncated file */ @@@@ -759,40 +759,38 @@@@ return 1; } -const char *Usage = "\ -Usage: fujiplay [OPTIONS] PICTURES... (download) - charge NUMBER (recharge the flash) - shoot (take picture) - preview (preview to standard output) - upload FILES... - delete FILES... - setid STRING (set camera ID) - setflash MODE (0=Off, 1=On, 2=Strobe, 3=Auto) - setdate gmt|local|YYYYMMDDHHMMSS -Options: - -B NUMBER Set baudrate (115200, 57600, 38400, 19200, 9600 or 0) - -D DEVICE Select another device file (default is /dev/fujifilm) - -L List command set - -7 DS-7 compatibility mode (experimental) - -d Delete pictures after successful download - -f Force (overwrite existing files) - -p Assume picture numbers instead of frame numbers - -h Display this help message - -v Version information -Pictures: - all All pictures - last Last picture - 4 Only picture 4 - 2-10 Pictures between 2 and 10 -Files: - DSCxxxxx.JPG Files to delete or to upload into the camera -"; - -const char *Copyright = "\ -Fujiplay, Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp -Written by Thierry Bousch -Public domain. Absolutely no warranty. -"; +const char *Usage = +"Usage: fujiplay [OPTIONS] PICTURES... (download)\n" +" charge NUMBER (recharge the flash)\n" +" shoot (take picture)\n" +" preview (preview to standard output)\n" +" upload FILES...\n" +" delete FILES...\n" +" setid STRING (set camera ID)\n" +" setflash MODE (0=Off, 1=On, 2=Strobe, 3=Auto)\n" +" setdate gmt|local|YYYYMMDDHHMMSS\n" +"Options:\n" +" -B NUMBER Set baudrate (115200, 57600, 38400, 19200, 9600 or 0)\n" +" -D DEVICE Select another device file (default is /dev/fujifilm)\n" +" -L List command set\n" +" -7 DS-7 compatibility mode (experimental)\n" +" -d Delete pictures after successful download\n" +" -f Force (overwrite existing files)\n" +" -p Assume picture numbers instead of frame numbers\n" +" -h Display this help message\n" +" -v Version information\n" +"Pictures:\n" +" all All pictures\n" +" last Last picture\n" +" 4 Only picture 4\n" +" 2-10 Pictures between 2 and 10\n" +"Files:\n" +" DSCxxxxx.JPG Files to delete or to upload into the camera\n"; + +const char *Copyright = +"Fujiplay, Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp\n" +"Written by Thierry Bousch \n" +"Public domain. Absolutely no warranty.\n"; static void sigint_handler (int sig) { @@@@ -984,7 +982,6 @@@@ download_range(atoi(arg), atoi(arg), picnums, force); } if (delete_after) { - sync(); deleted = 0; for (c = pictures; c > 0; c--) if (pinfo[c].transferred) @ 1.4 log @Fix build under gcc 3.x. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/03/10 14:07:29 tv Exp $ d59 1 a59 1 -Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $ d92 1 a92 1 +"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n" @ 1.3 log @Remove call to sync(2). It's not providing anything useful here, it's nonportable, and it's not available on Interix either. @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 3 --- fujiplay.c.orig 1999-02-23 04:30:31.000000000 -0500 +++ fujiplay.c @@@@ -36,5 +36,5 @@@@ d13 3 a15 1 @@@@ -633,6 +633,6 @@@@ void download_picture(int n) d24 3 a26 1 @@@@ -760,32 +760,31 @@@@ again: d57 6 d90 5 d96 4 a99 2 const char *Copyright = "\ @@@@ -985,5 +984,4 @@@@ set_date_from_arg: d105 1 @ 1.2 log @Fix CPP hacks with strings containing linebreaks. Very ugly hack (post-patch) to work around a RCS ID in area needing patch. @ text @d3 1 a3 1 --- fujiplay.c.orig 1999-02-23 10:30:31.000000000 +0100 d81 6 @ 1.1 log @Initial revision @ text @d3 3 a5 4 --- fujiplay.c.orig Tue Nov 23 04:55:05 1999 +++ fujiplay.c Tue Nov 23 04:58:42 1999 @@@@ -35,7 +35,7 @@@@ #define B115200 EXTB d12 69 a80 1 struct pict_info { @ 1.1.1.1 log @A program to download pictures from some Fujifilm digital cameras, like the DS-7, MX-500 and MX-700, using the serial link. It can also "press the shutter", upload images to the camera, or delete images from the camera. @ text @@