Author: dteske
Date: Mon Feb 1 00:44:29 2016
New Revision: 295107
URL: https://svnweb.freebsd.org/changeset/base/295107
Log:
MFC revisions 294860,294862,294892-294893,294922
r294860: Add keep_tite configuration option
r294862: Bump copyrights
r294892: Remove unused function prototype
r294893: Fix a crash if `-D' is used without `-t title'
r294922: Fix fatal warn when compiling under GCC 5.2.0
Approved by: re (marius)
Modified:
stable/10/lib/libdpv/dialog_util.c
stable/10/lib/libdpv/dialog_util.h
stable/10/lib/libdpv/dpv.3
stable/10/lib/libdpv/dpv.c
stable/10/lib/libdpv/dpv.h
stable/10/lib/libdpv/dpv_private.h
stable/10/sys/sys/param.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libdpv/dialog_util.c
==============================================================================
--- stable/10/lib/libdpv/dialog_util.c Sun Jan 31 21:34:25 2016
(r295106)
+++ stable/10/lib/libdpv/dialog_util.c Mon Feb 1 00:44:29 2016
(r295107)
@@ -261,6 +261,13 @@ dialog_spawn_gauge(char *init_prompt, pi
errx(EXIT_FAILURE, "Out of memory?!");
sprintf(dargv[n++], "--title");
dargv[n++] = title;
+ } else {
+ if ((dargv[n] = malloc(8)) == NULL)
+ errx(EXIT_FAILURE, "Out of memory?!");
+ sprintf(dargv[n++], "--title");
+ if ((dargv[n] = malloc(1)) == NULL)
+ errx(EXIT_FAILURE, "Out of memory?!");
+ *dargv[n++] = '\0';
}
if (backtitle != NULL) {
if ((dargv[n] = malloc(12)) == NULL)
Modified: stable/10/lib/libdpv/dialog_util.h
==============================================================================
--- stable/10/lib/libdpv/dialog_util.h Sun Jan 31 21:34:25 2016
(r295106)
+++ stable/10/lib/libdpv/dialog_util.h Mon Feb 1 00:44:29 2016
(r295107)
@@ -55,7 +55,6 @@ extern int dheight, dwidth;
__BEGIN_DECLS
uint8_t dialog_prompt_nlstate(const char *_prompt);
-void dialog_gauge_free(void);
void dialog_maxsize_free(void);
char *dialog_prompt_lastline(char *_prompt, uint8_t _nlstate);
int dialog_maxcols(void);
Modified: stable/10/lib/libdpv/dpv.3
==============================================================================
--- stable/10/lib/libdpv/dpv.3 Sun Jan 31 21:34:25 2016 (r295106)
+++ stable/10/lib/libdpv/dpv.3 Mon Feb 1 00:44:29 2016 (r295107)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2013-2015 Devin Teske
+.\" Copyright (c) 2013-2016 Devin Teske
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd Oct 22, 2015
+.Dd Jan 26, 2016
.Dt DPV 3
.Os
.Sh NAME
@@ -64,6 +64,7 @@ argument contains the following properti
features:
.Bd -literal -offset indent
struct dpv_config {
+ uint8_t keep_tite; /* Cleaner exit for scripts */
enum dpv_display display_type; /* Def. DPV_DISPLAY_LIBDIALOG */
enum dpv_output output_type; /* Default DPV_OUTPUT_NONE */
int debug; /* Enable debug on stderr */
Modified: stable/10/lib/libdpv/dpv.c
==============================================================================
--- stable/10/lib/libdpv/dpv.c Sun Jan 31 21:34:25 2016 (r295106)
+++ stable/10/lib/libdpv/dpv.c Mon Feb 1 00:44:29 2016 (r295107)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013-2014 Devin Teske <[email protected]>
+ * Copyright (c) 2013-2016 Devin Teske <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,7 @@ long long dpv_overall_read = 0;
static char pathbuf[PATH_MAX];
/* Extra display information */
+uint8_t keep_tite = FALSE; /* dpv_config.keep_tite */
uint8_t no_labels = FALSE; /* dpv_config.options & DPV_NO_LABELS */
uint8_t wide = FALSE; /* dpv_config.options & DPV_WIDE_MODE */
char *aprompt = NULL; /* dpv_config.aprompt */
@@ -150,6 +151,7 @@ dpv(struct dpv_config *config, struct dp
dialog_updates_per_second = DIALOG_UPDATES_PER_SEC;
display_limit = DISPLAY_LIMIT_DEFAULT;
display_type = DPV_DISPLAY_LIBDIALOG;
+ keep_tite = FALSE;
label_size = LABEL_SIZE_DEFAULT;
msg_done = NULL;
msg_fail = NULL;
@@ -193,6 +195,7 @@ dpv(struct dpv_config *config, struct dp
dialog_updates_per_second = config->dialog_updates_per_second;
display_limit = config->display_limit;
display_type = config->display_type;
+ keep_tite = config->keep_tite;
label_size = config->label_size;
msg_done = (char *)config->msg_done;
msg_fail = (char *)config->msg_fail;
@@ -695,7 +698,7 @@ dpv(struct dpv_config *config, struct dp
close(dialog_out);
waitpid(pid, (int *)NULL, 0);
}
- if (!dpv_interrupt)
+ if (!keep_tite && !dpv_interrupt)
printf("\n");
} else
warnx("%s: %lli overall read", __func__, dpv_overall_read);
Modified: stable/10/lib/libdpv/dpv.h
==============================================================================
--- stable/10/lib/libdpv/dpv.h Sun Jan 31 21:34:25 2016 (r295106)
+++ stable/10/lib/libdpv/dpv.h Mon Feb 1 00:44:29 2016 (r295107)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013-2014 Devin Teske <[email protected]>
+ * Copyright (c) 2013-2016 Devin Teske <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -97,6 +97,7 @@ struct dpv_file_node {
* Anatomy of config option to pass as dpv() config argument
*/
struct dpv_config {
+ uint8_t keep_tite; /* Prevent visually distracting exit */
enum dpv_display display_type; /* Display (default TYPE_LIBDIALOG) */
enum dpv_output output_type; /* Output (default TYPE_NONE) */
int debug; /* Enable debugging output on stderr */
Modified: stable/10/lib/libdpv/dpv_private.h
==============================================================================
--- stable/10/lib/libdpv/dpv_private.h Sun Jan 31 21:34:25 2016
(r295106)
+++ stable/10/lib/libdpv/dpv_private.h Mon Feb 1 00:44:29 2016
(r295107)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013-2014 Devin Teske <[email protected]>
+ * Copyright (c) 2013-2016 Devin Teske <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,7 @@ extern uint8_t debug;
extern unsigned int dpv_nfiles;
/* Extra display information */
+extern uint8_t keep_tite;
extern uint8_t no_labels;
extern uint8_t wide;
extern char *msg_done, *msg_fail, *msg_pending;
Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h Sun Jan 31 21:34:25 2016 (r295106)
+++ stable/10/sys/sys/param.h Mon Feb 1 00:44:29 2016 (r295107)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1002508 /* Master, propagated to newvers */
+#define __FreeBSD_version 1002509 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
