projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cbd03ca
)
Don't use %m in fprintf().
author
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 24 Jul 2001 20:03:40 +0000
(20:03 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 24 Jul 2001 20:03:40 +0000
(20:03 +0000)
src/conf.c
patch
|
blob
|
history
src/process.c
patch
|
blob
|
history
diff --git
a/src/conf.c
b/src/conf.c
index
0eaf0ca
..
01c3fcd
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,7
+19,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.4
1 2001/06/05 19:39:54
guus Exp $
+ $Id: conf.c,v 1.9.4.4
2 2001/07/24 20:03:40
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-35,6
+35,7
@@
#include <sys/types.h>
#include <unistd.h>
#include <syslog.h>
#include <sys/types.h>
#include <unistd.h>
#include <syslog.h>
+#include <string.h>
#include <xalloc.h>
#include <utils.h> /* for cp */
#include <xalloc.h>
#include <utils.h> /* for cp */
@@
-495,7
+496,7
@@
FILE *ask_and_safe_open(const char* filename, const char* what, const char* mode
if((fn = readline(stdin, NULL, NULL)) == NULL)
{
if((fn = readline(stdin, NULL, NULL)) == NULL)
{
- fprintf(stderr, _("Error while reading stdin: %
m\n"
));
+ fprintf(stderr, _("Error while reading stdin: %
s\n"), strerror(errno
));
return NULL;
}
return NULL;
}
@@
-521,8
+522,8
@@
FILE *ask_and_safe_open(const char* filename, const char* what, const char* mode
/* Open it first to keep the inode busy */
if((r = fopen(fn, mode)) == NULL)
{
/* Open it first to keep the inode busy */
if((r = fopen(fn, mode)) == NULL)
{
- fprintf(stderr, _("Error opening file `%s': %
m
\n"),
- fn);
+ fprintf(stderr, _("Error opening file `%s': %
s
\n"),
+ fn
, strerror(errno)
);
free(fn);
return NULL;
}
free(fn);
return NULL;
}
diff --git
a/src/process.c
b/src/process.c
index
d618427
..
bf3d6b7
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.2
2 2001/03/13 09:55:14
guus Exp $
+ $Id: process.c,v 1.1.2.2
3 2001/07/24 20:03:40
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-164,7
+164,7
@@
cp
{
if(daemon(0, 0) < 0)
{
{
if(daemon(0, 0) < 0)
{
- fprintf(stderr, _("Couldn't detach from terminal: %
m"
));
+ fprintf(stderr, _("Couldn't detach from terminal: %
s"), strerror(errno
));
return -1;
}
return -1;
}
@@
-427,7
+427,7
@@
setup_signals(void)
{
act.sa_sigaction = sighandlers[i].handler;
if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
{
act.sa_sigaction = sighandlers[i].handler;
if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
- fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %
m
\n"),
- sighandlers[i].signal, strsignal(sighandlers[i].signal));
+ fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %
s
\n"),
+ sighandlers[i].signal, strsignal(sighandlers[i].signal)
, strerror(errno)
);
}
}
}
}