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
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
diff -ruN ../0.3.9_6/libMGPM/src/MGPMrUpdate.c ./libMGPM/src/MGPMrUpdate.c
--- ../0.3.9_6/libMGPM/src/MGPMrUpdate.c Sat Dec 3 14:45:00 2005
+++ ./libMGPM/src/MGPMrUpdate.c Sat Dec 3 17:50:47 2005
@@ -203,17 +203,20 @@
property->fieldConfigDbKey,
STOP,
property->fieldConfigDbKey,
- exact )
- &&
- strncmp( oldPortDir,
- MGdbGet( property->configDb,
- MGdbGetRecno( property->configDb ) - 1,
- property->fieldConfigDbValue ),
- strlen( oldPortDir ) ) == 0 )
+ exact ) )
{
stopPortDirPtr = MGdbGet( property->configDb,
MGdbGetRecno( property->configDb ) - 1,
property->fieldConfigDbValue );
+
+ if( strncmp( oldPortDir, MGdbGet( property->configDb,
+ MGdbGetRecno( property->configDb ) - 1,
+ property->fieldConfigDbValue ),
+ strlen( oldPortDir ) ) )
+ {
+ continue;
+ }
+
if( stopPortDirPtr[strlen( oldPortDir )] == SPACE )
{
strncpy( localProperty.stopPortDir, stopPortDirPtr, strlen( oldPortDir ) );
@@ -230,17 +233,21 @@
property->fieldConfigDbKey,
START,
property->fieldConfigDbKey,
- exact )
- &&
- strncmp( oldPortDir,
- MGdbGet( property->configDb,
- MGdbGetRecno( property->configDb ) - 1,
- property->fieldConfigDbValue ),
- strlen( oldPortDir ) ) == 0 )
+ exact ) )
+
{
startPortDirPtr = MGdbGet( property->configDb,
MGdbGetRecno( property->configDb ) - 1,
property->fieldConfigDbValue );
+
+ if( strncmp( oldPortDir, MGdbGet( property->configDb,
+ MGdbGetRecno( property->configDb ) - 1,
+ property->fieldConfigDbValue ),
+ strlen( oldPortDir ) ) )
+ {
+ continue;
+ }
+
if( startPortDirPtr[strlen( oldPortDir )] == SPACE )
{
strncpy( localProperty.startPortDir, startPortDirPtr, strlen( oldPortDir ) );
@@ -1082,33 +1089,9 @@
pHandle = popen( localProperty.stopPortCmd, "r" );
fread( localProperty.buffer, bufferSize, 1, pHandle );
pclose( pHandle );
-/*
- idx = 0;
- while( idx < bufferSize )
- {
- if( localProperty.buffer[idx] == LINEFEED
- ||
- localProperty.buffer[idx] == TAB
- ||
- localProperty.buffer[idx] == SPACE )
- {
- localProperty.buffer[idx] = 0;
- break;
- }
- idx++;
- }
-*/
- if( property->log )
- {
- strcpy( localProperty.command, "echo \" stopping " );
- strcat( localProperty.command, oldPortName );
- strcat( localProperty.command, " " );
- strcat( localProperty.command, oldPortDir );
- strcat( localProperty.command, " execution by running " );
- strcat( localProperty.command, localProperty.stopPortCmd );
- strcat( localProperty.command, " \">> /var/log/portmanager.log" );
- system( localProperty.command );
- }
+
+ MGPMlogAdd( property, "stopping ", oldPortName, oldPortDir, " execution by running ", localProperty.stopPortCmd );
+
fprintf( stdout, "%s reply: %s\n", localProperty.stopPortCmd, localProperty.buffer );
while( fflush( stdout ) );
}
@@ -1264,19 +1247,6 @@
system( localProperty.command );
}
}
-
- /*
- * 5 second time delay
- */
-/*
- property->STDIN = fopen( "/dev/STDIN", "r" );
- signal( SIGALRM, MGPMrTimer );
- alarm( 5 );
- answer = getc( property->STDIN );
- alarm(0);
- fclose( property->STDIN );
-*/
-
strcpy( localProperty.command, "cp /tmp/*.db " );
strcat( localProperty.command, SHAREDIR );
fprintf( stdout, "restoring databases localProperty.command:%s\n", localProperty.command );
@@ -1298,33 +1268,8 @@
pHandle = popen( localProperty.startPortCmd, "r" );
fread( localProperty.buffer, bufferSize, 1, pHandle );
pclose( pHandle );
-/*
- idx = 0;
- while( idx < bufferSize )
- {
- if( localProperty.buffer[idx] == LINEFEED
- ||
- localProperty.buffer[idx] == TAB
- ||
- localProperty.buffer[idx] == SPACE )
- {
- localProperty.buffer[idx] = 0;
- break;
- }
- idx++;
- }
-*/
- if( property->log )
- {
- strcpy( localProperty.command, "echo \" starting " );
- strcat( localProperty.command, oldPortName );
- strcat( localProperty.command, " " );
- strcat( localProperty.command, oldPortDir );
- strcat( localProperty.command, " execution by running " );
- strcat( localProperty.command, localProperty.startPortCmd );
- strcat( localProperty.command, " \">> /var/log/portmanager.log" );
- system( localProperty.command );
- }
+
+ MGPMlogAdd( property, "starting ", oldPortName, oldPortDir, " execution by running ", localProperty.startPortCmd );
fprintf( stdout, "%s reply: %s\n", localProperty.startPortCmd, localProperty.buffer );
while( fflush( stdout ) );
@@ -1362,8 +1307,6 @@
fprintf( stdout, "restoring databases localProperty.command:%s\n", localProperty.command );
while( fflush( stdout ) );
system( localProperty.command );
-
-
}
else
{
@@ -1656,9 +1599,6 @@
strcat( command, curDir );
strcat( command, "/work 2>&1" );
-/*
- strcat( command, "/work" );
-*/
fprintf( stdout, "===> Cleaning for %s\n", portDir );
while( fflush( stdout ) );
|
