1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
$NetBSD: patch-ah,v 1.5 2014/01/02 07:34:11 dholland Exp $
- use standard headers
- don't declare own errno
- don't use sys_errlist
- don't use mktemp
- avoid void main
- use c89
--- tools/into.c.orig 1992-04-30 14:10:15.000000000 +0000
+++ tools/into.c
@@ -27,6 +27,7 @@
#include "rle_config.h"
#include <stdio.h>
+#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/param.h> /* for MAXPATHLEN */
@@ -40,19 +41,14 @@ static char temp[] = "intoXXXXXXXX";
static char buf[MAXPATHLEN+1];
short forceflg; /* overwrite an unwritable file? */
-extern int errno;
-extern char *sys_errlist[];
-
-void
-main(argc, argv)
-int argc;
-char **argv;
+int
+main(int argc, char **argv)
{
char *cp;
int c;
FILE * outf;
char iobuf[BUFSIZ];
- int size;
+ int size, fd;
/* Don't allow files named "-f" in order to catch common error */
if (argc >= 2 && !strcmp(argv[1], "-f"))
@@ -72,7 +68,7 @@ char **argv;
exit(1);
}
- if ( (cp = rindex( argv[1], '/' )) != NULL )
+ if ( (cp = rle_rindex( argv[1], '/' )) != NULL )
{
c = *++cp;
*cp = 0;
@@ -82,9 +78,9 @@ char **argv;
}
else
strcpy( buf, temp );
- mktemp( buf );
+ fd = mkstemp( buf );
- if ( (outf = fopen( buf, "w" )) == NULL )
+ if ( fd < 0 || (outf = fdopen( fd, "w" )) == NULL )
{
perror(buf);
exit(1);
@@ -103,7 +99,7 @@ char **argv;
if (ferror(outf))
{
fprintf(stderr, "into: %s, \"%s\" not modified\n",
- sys_errlist[errno], argv[1]);
+ strerror(errno), argv[1]);
unlink(buf);
exit(1);
}
@@ -118,8 +114,8 @@ char **argv;
}
#ifdef NEED_RENAME
-rename( file1, file2 )
-char *file1, *file2;
+int
+rename( char *file1, char *file2 )
{
struct stat st;
|
