svn commit: r335407 - stable/10/lib/libdpv

[Devin Teske]

Author: dteske
Date: Wed Jun 20 05:50:54 2018
New Revision: 335407
URL: https://svnweb.freebsd.org/changeset/base/335407

Log:
  dpv(3): MFC r330943, r335264
  
  r330943:
  Fix bad error messages from dpv(3)
  
  Before = dpv: <__func__>: posix_spawnp(3): No such file or directory
   After = dpv: <path/cmd>: No such file or directory
  
  Most notably, show the 2nd argument being passed to posix_spawnp(3)
  so we know what path/cmd failed.
  
  Also, we don't need to have "posix_spawnp(3)" in the error message
  nor the function because that can [a] change and [b] traversed using
  a debugger if necessary.
  
  r335264:
  Fix comparison between pointer and char literal
  
  PR:		misc/204252
  Reported by:	David Binderman <dcb314 at hotmail.com>
  Sponsored by:	Smule, Inc.

Modified:
  stable/10/lib/libdpv/dialog_util.c
  stable/10/lib/libdpv/dprompt.c
  stable/10/lib/libdpv/util.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libdpv/dialog_util.c
==============================================================================
--- stable/10/lib/libdpv/dialog_util.c	Wed Jun 20 05:45:41 2018	(r335406)
+++ stable/10/lib/libdpv/dialog_util.c	Wed Jun 20 05:50:54 2018	(r335407)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske <dteske at FreeBSD.org>
+ * Copyright (c) 2013-2018 Devin Teske <dteske at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -328,8 +328,7 @@ dialog_spawn_gauge(char *init_prompt, pid_t *pid)
 	posix_spawn_file_actions_addclose(&action, stdin_pipe[1]);
 	error = posix_spawnp(pid, dialog, &action,
 	    (const posix_spawnattr_t *)NULL, dargv, environ);
-	if (error != 0)
-		err(EXIT_FAILURE, "%s: posix_spawnp(3)", __func__);
+	if (error != 0) err(EXIT_FAILURE, "%s", dialog);
 
 	/* NB: Do not free(3) *dargv[], else SIGSEGV */
 

Modified: stable/10/lib/libdpv/dprompt.c
==============================================================================
--- stable/10/lib/libdpv/dprompt.c	Wed Jun 20 05:45:41 2018	(r335406)
+++ stable/10/lib/libdpv/dprompt.c	Wed Jun 20 05:50:54 2018	(r335407)
@@ -89,7 +89,7 @@ spin_char(void)
 {
 	char ch;
 
-	if (spin_cp == '\0')
+	if (*spin_cp == '\0')
 		spin_cp = spin;
 	ch = *spin_cp;
 

Modified: stable/10/lib/libdpv/util.c
==============================================================================
--- stable/10/lib/libdpv/util.c	Wed Jun 20 05:45:41 2018	(r335406)
+++ stable/10/lib/libdpv/util.c	Wed Jun 20 05:50:54 2018	(r335407)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske <dteske at FreeBSD.org>
+ * Copyright (c) 2013-2018 Devin Teske <dteske at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -100,8 +100,7 @@ shell_spawn_pipecmd(const char *cmd, const char *label
 	posix_spawn_file_actions_addclose(&action, stdin_pipe[1]);
 	error = posix_spawnp(pid, shellcmd, &action,
 	    (const posix_spawnattr_t *)NULL, shellcmd_argv, environ);
-	if (error != 0)
-		err(EXIT_FAILURE, "%s: posix_spawnp(3)", __func__);
+	if (error != 0) err(EXIT_FAILURE, "%s", shellcmd);
 
 	return stdin_pipe[1];
 }