head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.150 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.148 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.146 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.144 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.142 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.140 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.138 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.136 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.134 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.132 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.130 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.128 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.126 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.124 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.122 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.120 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.118 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.116 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.114 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.112 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.110 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.108 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.106 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.102 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.82 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.104 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.100 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.98 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.96 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.94 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.92 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.90 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.88 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.86 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.84 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.80 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.78 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.76 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.74 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.72 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.70 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.68 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.66 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.64 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.62 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.60 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.58 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.56 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.54 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.52 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.50 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.48 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.46 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.44 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.42 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.40 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.38 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.36 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.34 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.32 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.30 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.28 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.26 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.24 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.22 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.20 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.18 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.16 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.14 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.12 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.10 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.8 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.6 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.4 pkgsrc-2008Q1:1.4.0.2 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 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.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2008.02.22.02.14.53; author tnn; state Exp; branches; next 1.3; 1.3 date 2006.05.15.16.01.03; author tron; state Exp; branches; next 1.2; 1.2 date 99.11.27.17.12.43; author hubertf; state Exp; branches; next 1.1; 1.1 date 99.06.16.01.32.51; author simonb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.06.16.01.32.51; author simonb; state Exp; branches; next ; desc @@ 1.4 log @- merge patch-aa and patch-ab, they patched the same file. - Uses asprintf and getopt_long This closes PR pkg/38054. @ text @$NetBSD$ --- watch.c.orig 2008-02-22 03:05:28.000000000 +0100 +++ watch.c @@@@ -13,7 +13,13 @@@@ #define VERSION "0.2.0" #include +#if defined(HAVE_NBCOMPAT_H) +#include +#include +#include +#else #include +#endif #include #include #include @@@@ -142,6 +148,7 @@@@ main(int argc, char *argv[]) option_differences_cumulative = 0, option_help = 0, option_version = 0; float interval = 2; + struct timespec tsinterval; char *command; int command_length = 0; /* not including final \0 */ @@@@ -199,6 +206,9 @@@@ main(int argc, char *argv[]) if (optind >= argc) do_usage(); + tsinterval.tv_sec = interval; + tsinterval.tv_nsec = (interval - tsinterval.tv_sec) * 1000000000L; + command = strdup(argv[optind++]); command_length = strlen(command); for (; optind < argc; optind++) { @@@@ -246,10 +256,16 @@@@ main(int argc, char *argv[]) } if (show_title) { +#if defined(__sun) + header = malloc(width + 1); + if (!header) { perror("malloc"); do_exit(2); } + snprintf(header, width + 1, "Every %.1fs: %s", interval, command); +#else // left justify interval and command, // right justify time, clipping all to fit window width asprintf(&header, "Every %.1fs: %.*s", interval, min(width - 1, command_length), command); +#endif mvaddstr(0, 0, header); if (strlen(header) > (size_t) (width - tsl - 1)) mvaddstr(0, width - tsl - 4, "... "); @@@@ -313,7 +329,7 @@@@ main(int argc, char *argv[]) first_screen = 0; refresh(); - usleep(interval * 1000000); + nanosleep(&tsinterval, NULL); } endwin(); @ 1.3 log @Update "watch" package to version 3.2.6 (taken from "procps-3.2.6" distribution). The new versions supports a lot of new command line options for e.g. cumulative or sub second intervals. @ text @d3 60 a62 13 --- watch.c.orig 2005-10-30 00:44:53.000000000 +0100 +++ watch.c 2006-05-15 16:49:04.000000000 +0100 @@@@ -164,9 +164,7 @@@@ break; case 'n': { - char *str; - interval = strtof(optarg, &str); - if (!*optarg || *str) + if (sscanf(optarg, "%f", &interval) != 1) do_usage(); if(interval < 0.1) interval = 0.1; @ 1.2 log @Fix some LP64 compile problem, submitted in PR 8892 by Antti Kantee @ text @d3 13 a15 39 --- watch.c.orig Sun Mar 21 18:49:20 1999 +++ watch.c Sat Nov 27 18:10:34 1999 @@@@ -6,7 +6,7 @@@@ * Slighty modified, and corrected, Francois Pinard, 91-04. */ -#include +#include #include #include #include @@@@ -17,10 +17,15 @@@@ int die_flag; void die (); +#ifdef __NetBSD__ +#include +#include +#else extern FILE *popen (); extern int pclose (); extern long time (); extern char *ctime (); +#endif /*-----------------------------------------. * Decode parameters and launch execution. | @@@@ -38,7 +43,11 @@@@ char buf[180]; char cmd[128]; int count = 1; +#ifdef __NetBSD__ + time_t timer; +#else long timer; +#endif int nsecs = 2; int total_chars; @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- watch.c.orig Mon Mar 22 04:49:20 1999 +++ watch.c Wed Jun 16 10:41:38 1999 d14 28 @ 1.1.1.1 log @watch - watch a program with update intervals. Originally from comp.sources.unix volume 24, now part of the linux "procps" package. @ text @@