summaryrefslogtreecommitdiff
path: root/comms/scmxx/patches/patch-aa
blob: 875f5c629e40d060c5cd6c2e63f37379b54fcaae (plain)
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
$NetBSD: patch-aa,v 1.3 2002/03/27 22:44:29 kleink Exp $

--- common.c.orig	Wed Mar 27 22:34:02 2002
+++ common.c	Wed Mar 27 23:34:49 2002
@@ -198,19 +198,19 @@
 int open_myFile_ro(){
 	int myfd;
 	char *myFILE_p=myFILE;
-	static int stdin = 0;
+	static int use_stdin = 0;
 	
 	if (!strcmp(myFILE,"-")) {
-	    stdin=1;
+	    use_stdin=1;
 	}
-	if (strlen(myFILE)!=0 && !stdin){
+	if (strlen(myFILE)!=0 && !use_stdin){
 		myfd=open(myFILE,O_RDONLY);
 		if(myfd==-1){errexit("Could not access %s, aborting\n",myFILE);}
 		else{myprintf(0,"Accessing %s\n",myFILE);}
 	}else{
-		myfd=0;
+		myfd=STDIN_FILENO;
 		sprintf(myFILE_p,"stdin");
-		stdin=1;
+		use_stdin=1;
 	}
 	return(myfd);
 }
@@ -218,21 +218,21 @@
 int open_myFile_rw(){
 	int myfd;
 	char *myFILE_p=myFILE;
-	static int stdout = 0;
+	static int use_stdout = 0;
 
 	if (!strcmp(myFILE,"-")) {
-	    stdout=1;
+	    use_stdout=1;
 	}
-	if (strlen(myFILE)!=0 && !stdout){
+	if (strlen(myFILE)!=0 && !use_stdout){
 		myfd=open(myFILE ,O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR|S_IRGRP);
 		if (myfd==-1){
 			close(myfd);
 			errexit("%s could not be created.\n",myFILE);			
 		}else{myprintf(0,"%s created.\n",myFILE);}
 	}else{
-		myfd=1;
+		myfd=STDOUT_FILENO;
 		sprintf(myFILE_p,"stdout");
-		stdout=1;
+		use_stdout=1;
 	}
 	return(myfd);
 }