head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.166 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.164 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.162 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.160 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.158 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.156 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.154 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.152 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.150 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.148 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.146 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.144 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.142 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.140 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.138 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.136 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.134 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.132 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.130 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.128 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.126 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.124 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.122 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.118 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.98 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.120 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.116 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.114 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.112 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.110 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.108 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.106 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.104 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.102 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.100 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.96 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.94 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.92 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.90 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.88 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.86 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.84 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.82 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.80 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.78 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.76 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.74 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.72 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.70 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.68 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.66 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.64 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.62 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.60 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.58 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.56 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.54 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.52 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.50 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.46 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.44 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.42 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.40 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.38 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.34 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.32 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.30 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.14 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2006.01.24.19.08.09; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.05.23.23.35.12; author kristerw; state Exp; branches; next ; desc @@ 1.2 log @Use DT_REG / DT_DIR directly if available and fall back to DTTOIF if not. Bail out with an explicit error if none is present. @ text @$NetBSD$ --- newmail.c.orig 1999-10-14 04:49:42.000000000 +0000 +++ newmail.c @@@@ -28,6 +28,22 @@@@ static void usage(); static void version(); +#ifdef DT_REG +#define DIRENT_IS_REG(x) ((x) == DT_REG) +#elif defined(DTTOIF) +#define DIRENT_IS_REG(x) (S_ISREG(DTTOIF((x)))) +#else +#error "Neither DT_REG nor DTTOIF is defined." +#endif + +#ifdef DT_DIR +#define DIRENT_IS_DIR(x) ((x) == DT_DIR) +#elif defined(DTTOIF) +#define DIRENT_IS_DIR(x) (S_ISDIR(DTTOIF((x)))) +#else +#error "Neither DT_REG nor DTTOIF is defined." +#endif + unsigned char no_mail_message, individual_messages, use_exit_val; @@@@ -98,7 +114,7 @@@@ int main(int argc, char *argv[]) { continue; } /* see if its a regular file */ - if (S_ISREG(DTTOIF(curr_file->d_type))) { + if (DIRENT_IS_REG(curr_file->d_type)) { /* stat it for check_mailbox */ if (stat(curr_file->d_name, &file_info) == -1) { err(EX_NOINPUT, "couldn't stat %s/%s", argv[ui], curr_file->d_name); @@@@ -106,7 +122,7 @@@@ int main(int argc, char *argv[]) { check_mailbox(curr_file->d_name, &file_info, &found_mail); } else if (warn_non_regular) { /* just check its not a directory before warning */ - if (! S_ISDIR(DTTOIF(curr_file->d_type))) { + if (! DIRENT_IS_DIR(curr_file->d_type)) { warnx("Found %s/%s: Not a regular file", argv[ui], curr_file->d_name); } } /* end of is dirent a regular file */ @@@@ -148,19 +164,19 @@@@ void check_mailbox(const char *const fn, static void usage() { - fprintf(stderr,"usage: newmail [-deirv] directory|file directory|file ... - -where: - d: Prints messages when you do not have new mail - e: Exits with 0 on no new mail, 1 on new mail, > 1 on error - (normally exits with a value from sysexits(3)). May not be used - with -d or -i. - i: Prints a message for each mailbox that has new mail (and those - that don't if -d is also used) - r: Warns if it finds a non regular file - v: Print version number and exit - -directory|file are, respectively, directories to look in for mailboxes + fprintf(stderr,"usage: newmail [-deirv] directory|file directory|file ...\n\ +\n\ +where:\n\ + d: Prints messages when you do not have new mail\n\ + e: Exits with 0 on no new mail, 1 on new mail, > 1 on error\n\ + (normally exits with a value from sysexits(3)). May not be used\n\ + with -d or -i.\n\ + i: Prints a message for each mailbox that has new mail (and those\n\ + that don't if -d is also used)\n\ + r: Warns if it finds a non regular file\n\ + v: Print version number and exit\n\ + \n\ +directory|file are, respectively, directories to look in for mailboxes\n\ and mailboxes.\n"); exit(EX_USAGE); @ 1.1 log @Make this package compile when using gcc 3.3. @ text @d3 44 a46 3 --- newmail.c.orig 2004-05-24 01:29:15.000000000 +0200 +++ newmail.c 2004-05-24 01:32:01.000000000 +0200 @@@@ -148,19 +148,19 @@@@ @