mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrote configure.in and replaced header.in with one generated by autoheader, added copyright notice to all source files as per GNU standards, and changed "pv --version" output to conform to GNU standards.

Browse Source
This commit is contained in:
Andrew Wood
2023-07-22 19:35:43 +01:00
parent b923afc385
commit 7448c7f320
33 changed files with 1027 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/config-aux.h
+46
View File
@@ -0,0 +1,46 @@
/*
* Standard definitions to make use of the config.h values set by the
* `configure' script. Include this after config.h and before anything
* else.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef ENABLE_NLS
# include "library/gettext.h"
#else
# define _(String) (String)
# define N_(String) (String)
#endif
#undef HAVE_IPC
#ifdef HAVE_SYS_IPC_H
#define HAVE_IPC 1
#endif
#undef CURSOR_ANSWERBACK_BYTE_BY_BYTE
#ifndef _AIX
#define CURSOR_ANSWERBACK_BYTE_BY_BYTE 1
#endif
/* Boolean type support */
#undef HAVE_STDBOOL_H
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#else
# ifndef HAVE__BOOL
# ifdef __cplusplus
typedef bool _Bool;
# else
# define _Bool signed char
# endif
# endif
# define bool _Bool
# define false 0
# define true 1
# define __bool_true_false_are_defined 1
#endif
/* EOF */
src/include/library/getopt.h
+4
View File
@@ -1,5 +1,9 @@
/*
* Replacement getopt function's header file. Include this AFTER config.h.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifndef _LIBRARY_GETOPT_H
src/include/library/gettext.h
+3
View File
@@ -9,6 +9,9 @@
* # define N_(String) (String)
* #endif
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifndef _LIBRARY_GETTEXT_H
src/include/options.h
+4
View File
@@ -1,5 +1,9 @@
/*
* Global program option structure and the parsing function prototype.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifndef _OPTIONS_H
src/include/pv-internal.h
+5 -19
View File
@@ -1,33 +1,19 @@
/*
* Functions internal to the PV library.
* Functions internal to the PV library. Include "config.h" first.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifndef _PV_INTERNAL_H
#define _PV_INTERNAL_H 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _PV_H
#include "pv.h"
#endif /* _PV_H */
#include <signal.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
/*
* Since macOS 10.6, stat64 variants are equivalent to plain stat, and the
* suffixed versions have been removed in macOS 11. See stat(2).
*/
#if defined(__APPLE__) || defined(APPLE)
#define stat64 stat
#define fstat64 fstat
#define lstat64 lstat
#endif
#ifdef __cplusplus
extern "C" {
#endif
src/include/pv.h
+5 -1
View File
@@ -1,5 +1,9 @@
/*
* Functions used across the program.
* Functions used across the program. Include "config.h" first.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifndef _PV_H
src/library/getopt.c
+4
View File
@@ -1,5 +1,9 @@
/*
* Small reimplementation of getopt().
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
src/library/gettext.c
+4
View File
@@ -11,6 +11,10 @@
* returns a struct msg_table_s[] of msgid and msgstr pairs, with the end
* of the table being marked by a NULL msgid. The po2table.sh script will do
* this.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
src/main/debug.c
+4 -2
View File
@@ -1,10 +1,12 @@
/*
* Output debugging information.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "pv.h"
#include <stdio.h>
src/main/help.c
+4 -5
View File
@@ -1,18 +1,17 @@
/*
* Output command-line help to stdout.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#define N_(String) (String)
struct optdesc_s {
char *optshort;
char *optlong;
src/main/main.c
+4 -2
View File
@@ -1,11 +1,13 @@
/*
* Main program entry point - read the command line options, then perform
* the appropriate actions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "options.h"
#include "pv.h"
src/main/options.c
+4 -2
View File
@@ -1,10 +1,12 @@
/*
* Parse command-line options.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "options.h"
#include "library/getopt.h"
#include "pv.h"
src/main/remote.c
+4 -2
View File
@@ -1,10 +1,12 @@
/*
* Remote-control functions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "options.h"
#include "pv.h"
src/main/version.c
+16 -20
View File
@@ -1,34 +1,30 @@
/*
* Output version information to stdout.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
/*
* Display current package version.
* Display current package version as per GNU standards.
*/
void display_version(void)
{
printf(_("%s %s - Copyright %s %s"),
PROGRAM_NAME, VERSION, COPYRIGHT_YEAR, COPYRIGHT_HOLDER);
printf("\n\n");
printf(_("Web site: %s"), PROJECT_HOMEPAGE);
printf("\n\n");
printf("%s",
_("This program is free software, and is being distributed "
"under the\nterms of the Artistic License 2.0."));
printf("\n\n");
printf("%s",
_
("This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."));
printf("\n\n");
/* GNU standard first line format: program and version only */
printf("%s %s\n", PROGRAM_NAME, VERSION);
/* GNU standard second line format - "Copyright" always in English */
printf("Copyright %s %s\n",
COPYRIGHT_YEAR, COPYRIGHT_HOLDER);
/* GNU standard license line and free software notice */
printf("%s\n", _("License: Artistic v2.0 <https://opensource.org/license/artistic-2-0/>"));
printf("%s\n", _("This is free software: you are free to change and redistribute it."));
printf("%s\n", _("There is NO WARRANTY, to the extent permitted by law."));
/* Project web site link */
printf("\n%s: <%s>\n", _("Project web site"), PROJECT_HOMEPAGE);
}
/* EOF */
src/pv/cursor.c
+6
View File
@@ -9,8 +9,14 @@
* However, some OSes (FreeBSD and MacOS X so far) don't allow locking of a
* terminal, so we try to use a lockfile if terminal locking doesn't work,
* and finally abort if even that is unavailable.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
src/pv/display.c
+14 -2
View File
@@ -1,7 +1,13 @@
/*
* Display functions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
@@ -12,8 +18,14 @@
#include <errno.h>
#include <time.h>
#include <unistd.h>
#include <termios.h>
#include <sys/ioctl.h>
#ifdef HAVE_TERMIOS_H
# include <termios.h>
#endif
#ifdef GWINSZ_IN_SYS_IOCTL
# include <sys/ioctl.h>
#endif
/*
src/pv/file.c
+6
View File
@@ -1,7 +1,13 @@
/*
* Functions for opening and closing files.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
src/pv/loop.c
+11 -3
View File
@@ -1,8 +1,14 @@
/*
* Main program entry point - read the command line options, then perform
* the appropriate actions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
@@ -544,27 +550,29 @@ int pv_watchpid_loop(pvstate_t state)
format_string : state->default_format;
if (NULL == strstr(original_format_string, "%N")) {
#ifdef HAVE_SNPRINTF
snprintf(new_format_string, sizeof(new_format_string) - 1,
snprintf(new_format_string, sizeof(new_format_string),
#else
sprintf(new_format_string,
#endif
"%%N %s", original_format_string);
} else {
#ifdef HAVE_SNPRINTF
snprintf(new_format_string, sizeof(new_format_string) - 1,
snprintf(new_format_string, sizeof(new_format_string),
#else
sprintf(new_format_string,
#endif
"%s", original_format_string);
}
new_format_string[sizeof(new_format_string)-1] = '\0';
state_copy.format_string = NULL;
#ifdef HAVE_SNPRINTF
snprintf(state_copy.default_format,
sizeof(state_copy.default_format) - 1,
sizeof(state_copy.default_format),
#else
sprintf(state_copy.default_format,
#endif
"%.510s", new_format_string);
state_copy.default_format[sizeof(state_copy.default_format)-1] = '\0';
/*
* Get things ready for the main loop.
src/pv/number.c
+6 -4
View File
@@ -1,14 +1,16 @@
/*
* Functions for converting strings to numbers.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include <stddef.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "pv.h"
#include <stddef.h>
/*
* This function is used instead of the macro from <ctype.h> because
src/pv/signal.c
+6
View File
@@ -1,7 +1,13 @@
/*
* Signal handling functions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <signal.h>
src/pv/state.c
+6
View File
@@ -1,7 +1,13 @@
/*
* State management functions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
src/pv/transfer.c
+6
View File
@@ -1,7 +1,13 @@
/*
* Functions for transferring between file descriptors.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
src/pv/watchpid.c
+6
View File
@@ -1,7 +1,13 @@
/*
* Functions for watching file descriptors in other processes.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood
*
* Distributed under the Artistic License v2.0; see `doc/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>