Fossil SCM

Clean up handling of global variable to avoid accidental setting of database. Only alter database options if URL is SSH.

andybradford 2013-08-10 23:02 ssh-test-http
Commit 0c1942432551ca54a811f823305da9f047786e88
Parent 3c479fb95bc006a…
4 files changed +14 -12 +4 -4 -4 +12 -2
~ src/clone.c ~ src/sync.c ~ src/url.c ~ src/user.c
M src/clone.c
+14 -12
--- src/clone.c
+++ src/clone.c
@@ -158,12 +158,12 @@
158158
 db_multi_exec(
159159
 "REPLACE INTO config(name,value,mtime)"
160160
 " VALUES('server-code', lower(hex(randomblob(20))), now());"
161161
 );
162162
 url_enable_proxy(0);
163
- url_get_password_if_needed();
164163
 clone_ssh_db_set_options();
164
+ url_get_password_if_needed();
165165
 g.xlinkClusterOnly = 1;
166166
 nErr = client_sync(SYNC_CLONE | bPrivate,CONFIGSET_ALL,0);
167167
 g.xlinkClusterOnly = 0;
168168
 verify_cancel();
169169
 db_end_transaction(0);
@@ -213,18 +213,20 @@
213213
 /*
214214
 ** Set SSH options discovered in global variables (set from command line
215215
 ** options).
216216
 */
217217
 void clone_ssh_db_set_options(void){
218
- if( g.zSshFossilCmd && g.zSshFossilCmd[0] ){
219
- db_set("ssh-fossil", g.zSshFossilCmd, 0);
220
- }
221
- if( g.zSshCmd && g.zSshCmd[0] ){
222
- db_set("ssh-command", g.zSshCmd, 0);
223
- }
224
- if( g.zFossilUser && g.zFossilUser[0] ){
225
- db_set("ssh-fossil-user", g.zFossilUser, 0);
226
- }
227
- if( g.zSshUseHttp && g.zSshUseHttp[0] ){
228
- db_set_int("ssh-use-http", is_truth(g.zSshUseHttp), 0);
218
+ if( g.urlIsSsh ){
219
+ if( g.zSshFossilCmd && g.zSshFossilCmd[0] ){
220
+ db_set("ssh-fossil", g.zSshFossilCmd, 0);
221
+ }
222
+ if( g.zSshCmd && g.zSshCmd[0] ){
223
+ db_set("ssh-command", g.zSshCmd, 0);
224
+ }
225
+ if( g.zFossilUser && g.zFossilUser[0] ){
226
+ db_set("ssh-fossil-user", g.zFossilUser, 0);
227
+ }
228
+ if( g.zSshUseHttp && g.zSshUseHttp[0] ){
229
+ db_set_int("ssh-use-http", is_truth(g.zSshUseHttp), 0);
230
+ }
229231
 }
230232
 }
231233
--- src/clone.c
+++ src/clone.c
@@ -158,12 +158,12 @@
158 db_multi_exec(
159 "REPLACE INTO config(name,value,mtime)"
160 " VALUES('server-code', lower(hex(randomblob(20))), now());"
161 );
162 url_enable_proxy(0);
163 url_get_password_if_needed();
164 clone_ssh_db_set_options();
 
165 g.xlinkClusterOnly = 1;
166 nErr = client_sync(SYNC_CLONE | bPrivate,CONFIGSET_ALL,0);
167 g.xlinkClusterOnly = 0;
168 verify_cancel();
169 db_end_transaction(0);
@@ -213,18 +213,20 @@
213 /*
214 ** Set SSH options discovered in global variables (set from command line
215 ** options).
216 */
217 void clone_ssh_db_set_options(void){
218 if( g.zSshFossilCmd && g.zSshFossilCmd[0] ){
219 db_set("ssh-fossil", g.zSshFossilCmd, 0);
220 }
221 if( g.zSshCmd && g.zSshCmd[0] ){
222 db_set("ssh-command", g.zSshCmd, 0);
223 }
224 if( g.zFossilUser && g.zFossilUser[0] ){
225 db_set("ssh-fossil-user", g.zFossilUser, 0);
226 }
227 if( g.zSshUseHttp && g.zSshUseHttp[0] ){
228 db_set_int("ssh-use-http", is_truth(g.zSshUseHttp), 0);
 
 
229 }
230 }
231
--- src/clone.c
+++ src/clone.c
@@ -158,12 +158,12 @@
158 db_multi_exec(
159 "REPLACE INTO config(name,value,mtime)"
160 " VALUES('server-code', lower(hex(randomblob(20))), now());"
161 );
162 url_enable_proxy(0);
 
163 clone_ssh_db_set_options();
164 url_get_password_if_needed();
165 g.xlinkClusterOnly = 1;
166 nErr = client_sync(SYNC_CLONE | bPrivate,CONFIGSET_ALL,0);
167 g.xlinkClusterOnly = 0;
168 verify_cancel();
169 db_end_transaction(0);
@@ -213,18 +213,20 @@
213 /*
214 ** Set SSH options discovered in global variables (set from command line
215 ** options).
216 */
217 void clone_ssh_db_set_options(void){
218 if( g.urlIsSsh ){
219 if( g.zSshFossilCmd && g.zSshFossilCmd[0] ){
220 db_set("ssh-fossil", g.zSshFossilCmd, 0);
221 }
222 if( g.zSshCmd && g.zSshCmd[0] ){
223 db_set("ssh-command", g.zSshCmd, 0);
224 }
225 if( g.zFossilUser && g.zFossilUser[0] ){
226 db_set("ssh-fossil-user", g.zFossilUser, 0);
227 }
228 if( g.zSshUseHttp && g.zSshUseHttp[0] ){
229 db_set_int("ssh-use-http", is_truth(g.zSshUseHttp), 0);
230 }
231 }
232 }
233
M src/sync.c
+4 -4
--- src/sync.c
+++ src/sync.c
@@ -70,11 +70,11 @@
7070
 configSync = CONFIGSET_SHUN;
7171
 }
7272
 #endif
7373
 if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE;
7474
 is_fossil_user() && url_ssh_use_http() ?
75
- fossil_print("Autosync: (%s) %s\n", g.zFossilUser, g.urlCanonical) :
75
+ fossil_print("Autosync: (%s) %s\n", get_fossil_user(), g.urlCanonical) :
7676
 fossil_print("Autosync: %s\n", g.urlCanonical);
7777
 url_enable_proxy("via proxy: ");
7878
 rc = client_sync(flags, configSync, 0);
7979
 if( rc ) fossil_warning("Autosync failed");
8080
 return rc;
@@ -127,19 +127,19 @@
127127
 }
128128
 user_select();
129129
 if( g.argc==2 ){
130130
 if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
131131
 is_fossil_user() && url_ssh_use_http() ?
132
- fossil_print("Sync with (%s) %s\n", g.zFossilUser, g.urlCanonical) :
132
+ fossil_print("Sync with (%s) %s\n",get_fossil_user(),g.urlCanonical):
133133
 fossil_print("Sync with %s\n", g.urlCanonical);
134134
 }else if( (*pSyncFlags) & SYNC_PUSH ){
135135
 is_fossil_user() && url_ssh_use_http() ?
136
- fossil_print("Push to (%s) %s\n", g.zFossilUser, g.urlCanonical) :
136
+ fossil_print("Push to (%s) %s\n", get_fossil_user(), g.urlCanonical):
137137
 fossil_print("Push to %s\n", g.urlCanonical);
138138
 }else if( (*pSyncFlags) & SYNC_PULL ){
139139
 is_fossil_user() && url_ssh_use_http() ?
140
- fossil_print("Pull from (%s) %s\n", g.zFossilUser, g.urlCanonical) :
140
+ fossil_print("Pull from (%s) %s\n",get_fossil_user(),g.urlCanonical):
141141
 fossil_print("Pull from %s\n", g.urlCanonical);
142142
 }
143143
 }
144144
 url_enable_proxy("via proxy: ");
145145
 *pConfigFlags |= configSync;
146146
--- src/sync.c
+++ src/sync.c
@@ -70,11 +70,11 @@
70 configSync = CONFIGSET_SHUN;
71 }
72 #endif
73 if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE;
74 is_fossil_user() && url_ssh_use_http() ?
75 fossil_print("Autosync: (%s) %s\n", g.zFossilUser, g.urlCanonical) :
76 fossil_print("Autosync: %s\n", g.urlCanonical);
77 url_enable_proxy("via proxy: ");
78 rc = client_sync(flags, configSync, 0);
79 if( rc ) fossil_warning("Autosync failed");
80 return rc;
@@ -127,19 +127,19 @@
127 }
128 user_select();
129 if( g.argc==2 ){
130 if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
131 is_fossil_user() && url_ssh_use_http() ?
132 fossil_print("Sync with (%s) %s\n", g.zFossilUser, g.urlCanonical) :
133 fossil_print("Sync with %s\n", g.urlCanonical);
134 }else if( (*pSyncFlags) & SYNC_PUSH ){
135 is_fossil_user() && url_ssh_use_http() ?
136 fossil_print("Push to (%s) %s\n", g.zFossilUser, g.urlCanonical) :
137 fossil_print("Push to %s\n", g.urlCanonical);
138 }else if( (*pSyncFlags) & SYNC_PULL ){
139 is_fossil_user() && url_ssh_use_http() ?
140 fossil_print("Pull from (%s) %s\n", g.zFossilUser, g.urlCanonical) :
141 fossil_print("Pull from %s\n", g.urlCanonical);
142 }
143 }
144 url_enable_proxy("via proxy: ");
145 *pConfigFlags |= configSync;
146
--- src/sync.c
+++ src/sync.c
@@ -70,11 +70,11 @@
70 configSync = CONFIGSET_SHUN;
71 }
72 #endif
73 if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE;
74 is_fossil_user() && url_ssh_use_http() ?
75 fossil_print("Autosync: (%s) %s\n", get_fossil_user(), g.urlCanonical) :
76 fossil_print("Autosync: %s\n", g.urlCanonical);
77 url_enable_proxy("via proxy: ");
78 rc = client_sync(flags, configSync, 0);
79 if( rc ) fossil_warning("Autosync failed");
80 return rc;
@@ -127,19 +127,19 @@
127 }
128 user_select();
129 if( g.argc==2 ){
130 if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
131 is_fossil_user() && url_ssh_use_http() ?
132 fossil_print("Sync with (%s) %s\n",get_fossil_user(),g.urlCanonical):
133 fossil_print("Sync with %s\n", g.urlCanonical);
134 }else if( (*pSyncFlags) & SYNC_PUSH ){
135 is_fossil_user() && url_ssh_use_http() ?
136 fossil_print("Push to (%s) %s\n", get_fossil_user(), g.urlCanonical):
137 fossil_print("Push to %s\n", g.urlCanonical);
138 }else if( (*pSyncFlags) & SYNC_PULL ){
139 is_fossil_user() && url_ssh_use_http() ?
140 fossil_print("Pull from (%s) %s\n",get_fossil_user(),g.urlCanonical):
141 fossil_print("Pull from %s\n", g.urlCanonical);
142 }
143 }
144 url_enable_proxy("via proxy: ");
145 *pConfigFlags |= configSync;
146
M src/url.c
-4
--- src/url.c
+++ src/url.c
@@ -77,11 +77,10 @@
7777
7878
 if( zUrl==0 ){
7979
 zUrl = db_get("last-sync-url", 0);
8080
 if( zUrl==0 ) return;
8181
 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
82
- g.zFossilUser = db_get("ssh-fossil-user", 0);
8382
 bSetUrl = 0;
8483
 }
8584
8685
 if( strncmp(zUrl, "http://", 7)==0
8786
 || strncmp(zUrl, "https://", 8)==0
@@ -188,13 +187,10 @@
188187
 }
189188
 }else{
190189
 fossil_fatal("unknown repository: %s", zUrl);
191190
 }
192191
 g.urlFlags = urlFlags;
193
- if( g.urlIsSsh && g.zFossilUser==0 ){
194
- g.zFossilUser = db_get("ssh-fossil-user", 0);
195
- }
196192
 if( g.urlIsFile ){
197193
 Blob cfile;
198194
 dehttpize(zFile);
199195
 file_canonical_name(zFile, &cfile, 0);
200196
 free(zFile);
201197
--- src/url.c
+++ src/url.c
@@ -77,11 +77,10 @@
77
78 if( zUrl==0 ){
79 zUrl = db_get("last-sync-url", 0);
80 if( zUrl==0 ) return;
81 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
82 g.zFossilUser = db_get("ssh-fossil-user", 0);
83 bSetUrl = 0;
84 }
85
86 if( strncmp(zUrl, "http://", 7)==0
87 || strncmp(zUrl, "https://", 8)==0
@@ -188,13 +187,10 @@
188 }
189 }else{
190 fossil_fatal("unknown repository: %s", zUrl);
191 }
192 g.urlFlags = urlFlags;
193 if( g.urlIsSsh && g.zFossilUser==0 ){
194 g.zFossilUser = db_get("ssh-fossil-user", 0);
195 }
196 if( g.urlIsFile ){
197 Blob cfile;
198 dehttpize(zFile);
199 file_canonical_name(zFile, &cfile, 0);
200 free(zFile);
201
--- src/url.c
+++ src/url.c
@@ -77,11 +77,10 @@
77
78 if( zUrl==0 ){
79 zUrl = db_get("last-sync-url", 0);
80 if( zUrl==0 ) return;
81 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
 
82 bSetUrl = 0;
83 }
84
85 if( strncmp(zUrl, "http://", 7)==0
86 || strncmp(zUrl, "https://", 8)==0
@@ -188,13 +187,10 @@
187 }
188 }else{
189 fossil_fatal("unknown repository: %s", zUrl);
190 }
191 g.urlFlags = urlFlags;
 
 
 
192 if( g.urlIsFile ){
193 Blob cfile;
194 dehttpize(zFile);
195 file_canonical_name(zFile, &cfile, 0);
196 free(zFile);
197
M src/user.c
+12 -2
--- src/user.c
+++ src/user.c
@@ -160,18 +160,28 @@
160160
161161
 /*
162162
 ** Return Fossil user if allocated and URL is SSH or URL user
163163
 */
164164
 const char *url_or_fossil_user(void){
165
- return is_fossil_user() ? g.zFossilUser : g.urlUser;
165
+ return is_fossil_user() ? get_fossil_user() : g.urlUser;
166
+}
167
+
168
+/*
169
+** Return the Fossil user from global variable (set from command line
170
+** or ssh-fossil-user database setting.
171
+*/
172
+const char *get_fossil_user(void){
173
+ return ( g.zFossilUser && g.zFossilUser[0] ) ? g.zFossilUser :
174
+ db_get("ssh-fossil-user", 0);
166175
 }
167176
168177
 /*
169178
 ** Return true if URL is SSH and Fossil user is allocated
170179
 */
171180
 int is_fossil_user(void) {
172
- return g.urlIsSsh && g.zFossilUser && g.zFossilUser[0];
181
+ return g.urlIsSsh && ( g.zFossilUser && g.zFossilUser[0] ||
182
+ db_get("ssh-fossil-user", 0)!=0 );
173183
 }
174184
175185
 /*
176186
 ** Prompt the user to enter a single line of text.
177187
 */
178188
--- src/user.c
+++ src/user.c
@@ -160,18 +160,28 @@
160
161 /*
162 ** Return Fossil user if allocated and URL is SSH or URL user
163 */
164 const char *url_or_fossil_user(void){
165 return is_fossil_user() ? g.zFossilUser : g.urlUser;
 
 
 
 
 
 
 
 
 
166 }
167
168 /*
169 ** Return true if URL is SSH and Fossil user is allocated
170 */
171 int is_fossil_user(void) {
172 return g.urlIsSsh && g.zFossilUser && g.zFossilUser[0];
 
173 }
174
175 /*
176 ** Prompt the user to enter a single line of text.
177 */
178
--- src/user.c
+++ src/user.c
@@ -160,18 +160,28 @@
160
161 /*
162 ** Return Fossil user if allocated and URL is SSH or URL user
163 */
164 const char *url_or_fossil_user(void){
165 return is_fossil_user() ? get_fossil_user() : g.urlUser;
166 }
167
168 /*
169 ** Return the Fossil user from global variable (set from command line
170 ** or ssh-fossil-user database setting.
171 */
172 const char *get_fossil_user(void){
173 return ( g.zFossilUser && g.zFossilUser[0] ) ? g.zFossilUser :
174 db_get("ssh-fossil-user", 0);
175 }
176
177 /*
178 ** Return true if URL is SSH and Fossil user is allocated
179 */
180 int is_fossil_user(void) {
181 return g.urlIsSsh && ( g.zFossilUser && g.zFossilUser[0] ||
182 db_get("ssh-fossil-user", 0)!=0 );
183 }
184
185 /*
186 ** Prompt the user to enter a single line of text.
187 */
188

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button