Diff

Differences From Artifact [3f4cd75ede]:

To Artifact [0825c71594]:


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

173
174
175
176
177
178

179
180
181
182

183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201


202
203
204
205
206
207
208
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
173
174
175
176
177

178
179
180
181

182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199


200
201
202
203
204
205
206
207
208







-
+






-
+






-
-
+
+






-
-
+
+






-
-
+
+






-
+








-
-
+
+








-
+


-
+





-
+



-
+

















-
-
+
+







 */

#define RETURN(x) do { \
    if ((x) == 2 && !value) return -2; \
    ret = x; \
} while (0)

int cmdline_process_param(char *p, char *value, int need_save)
int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
{
    int ret = 0;

    if (!strcmp(p, "-load")) {
	RETURN(2);
	SAVEABLE(0);		       /* very high priority */
	do_defaults(value, &cfg);
	do_defaults(value, cfg);
	return 2;
    }
    if (!strcmp(p, "-ssh")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	default_protocol = cfg.protocol = PROT_SSH;
	default_port = cfg.port = 22;
	default_protocol = cfg->protocol = PROT_SSH;
	default_port = cfg->port = 22;
	return 1;
    }
    if (!strcmp(p, "-telnet")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	default_protocol = cfg.protocol = PROT_TELNET;
	default_port = cfg.port = 23;
	default_protocol = cfg->protocol = PROT_TELNET;
	default_port = cfg->port = 23;
	return 1;
    }
    if (!strcmp(p, "-rlogin")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	default_protocol = cfg.protocol = PROT_RLOGIN;
	default_port = cfg.port = 513;
	default_protocol = cfg->protocol = PROT_RLOGIN;
	default_port = cfg->port = 513;
	return 1;
    }
    if (!strcmp(p, "-raw")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	default_protocol = cfg.protocol = PROT_RAW;
	default_protocol = cfg->protocol = PROT_RAW;
    }
    if (!strcmp(p, "-v")) {
	RETURN(1);
	flags |= FLAG_VERBOSE;
    }
    if (!strcmp(p, "-l")) {
	RETURN(2);
	SAVEABLE(1);
	strncpy(cfg.username, value, sizeof(cfg.username));
	cfg.username[sizeof(cfg.username) - 1] = '\0';
	strncpy(cfg->username, value, sizeof(cfg->username));
	cfg->username[sizeof(cfg->username) - 1] = '\0';
    }
    if ((!strcmp(p, "-L") || !strcmp(p, "-R"))) {
	char *fwd, *ptr, *q, *qq;
	int i=0;
	RETURN(2);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	fwd = value;
	ptr = cfg.portfwd;
	ptr = cfg->portfwd;
	/* if multiple forwards, find end of list */
	if (ptr[0]=='R' || ptr[0]=='L') {
	    for (i = 0; i < sizeof(cfg.portfwd) - 2; i++)
	    for (i = 0; i < sizeof(cfg->portfwd) - 2; i++)
		if (ptr[i]=='\000' && ptr[i+1]=='\000')
		    break;
	    ptr = ptr + i + 1;  /* point to next forward slot */
	}
	ptr[0] = p[1];  /* insert a 'L' or 'R' at the start */
	if (strlen(fwd) > sizeof(cfg.portfwd) - i - 2) {
	if (strlen(fwd) > sizeof(cfg->portfwd) - i - 2) {
	    cmdline_error("out of space for port forwardings");
	    return ret;
	}
	strncpy(ptr+1, fwd, sizeof(cfg.portfwd) - i);
	strncpy(ptr+1, fwd, sizeof(cfg->portfwd) - i);
	/*
	 * We expect _at least_ two colons in this string. The
	 * possible formats are `sourceport:desthost:destport', or
	 * `sourceip:sourceport:desthost:destport' if you're
	 * specifying a particular loopback address. We need to
	 * replace the one between source and dest with a \t; this
	 * means we must find the second-to-last colon in the
	 * string.
	 */
	q = qq = strchr(ptr, ':');
	while (qq) {
	    char *qqq = strchr(qq+1, ':');
	    if (qqq)
		q = qq;
	    qq = qqq;
	}
	if (q) *q = '\t';	       /* replace second-last colon with \t */
	cfg.portfwd[sizeof(cfg.portfwd) - 1] = '\0';
	cfg.portfwd[sizeof(cfg.portfwd) - 2] = '\0';
	cfg->portfwd[sizeof(cfg->portfwd) - 1] = '\0';
	cfg->portfwd[sizeof(cfg->portfwd) - 2] = '\0';
	ptr[strlen(ptr)+1] = '\000';    /* append two '\000' */
    }
    if (!strcmp(p, "-m")) {
	char *filename, *command;
	int cmdlen, cmdsize;
	FILE *fp;
	int c, d;
228
229
230
231
232
233
234
235
236
237



238
239
240
241
242

243
244
245
246
247
248
249
250
251
252
253
254
255

256
257
258
259
260
261

262
263
264
265
266
267
268

269
270
271
272
273
274

275
276
277
278
279
280
281

282
283
284
285
286
287

288
289
290
291
292
293

294
295
296
297
298
299

300
301
302
303
304

305
306
307
308
309
310
311


312
313
314
315
316
317

318
319
320
321
322
323

324
228
229
230
231
232
233
234



235
236
237
238
239
240
241

242
243
244
245
246
247
248
249
250
251
252
253
254

255
256
257
258
259
260

261
262
263
264
265
266
267

268
269
270
271
272
273

274
275
276
277
278
279
280

281
282
283
284
285
286

287
288
289
290
291
292

293
294
295
296
297
298

299
300
301
302
303

304
305
306
307
308
309


310
311
312
313
314
315
316

317
318
319
320
321
322

323
324







-
-
-
+
+
+




-
+












-
+





-
+






-
+





-
+






-
+





-
+





-
+





-
+




-
+





-
-
+
+





-
+





-
+

		d = 0;
	    if (cmdlen >= cmdsize) {
		cmdsize = cmdlen + 512;
		command = srealloc(command, cmdsize);
	    }
	    command[cmdlen++] = d;
	} while (c != EOF);
	cfg.remote_cmd_ptr = command;
	cfg.remote_cmd_ptr2 = NULL;
	cfg.nopty = TRUE;      /* command => no terminal */
	cfg->remote_cmd_ptr = command;
	cfg->remote_cmd_ptr2 = NULL;
	cfg->nopty = TRUE;      /* command => no terminal */
    }
    if (!strcmp(p, "-P")) {
	RETURN(2);
	SAVEABLE(2);		       /* lower priority than -ssh,-telnet */
	cfg.port = atoi(value);
	cfg->port = atoi(value);
    }
    if (!strcmp(p, "-pw")) {
	RETURN(2);
	cmdline_password = value;
	ssh_get_line = cmdline_get_line;
	ssh_getline_pw_only = TRUE;
    }

    if (!strcmp(p, "-A")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	cfg.agentfwd = 1;
	cfg->agentfwd = 1;
    }
    if (!strcmp(p, "-a")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	cfg.agentfwd = 0;
	cfg->agentfwd = 0;
    }

    if (!strcmp(p, "-X")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	cfg.x11_forward = 1;
	cfg->x11_forward = 1;
    }
    if (!strcmp(p, "-x")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	cfg.x11_forward = 0;
	cfg->x11_forward = 0;
    }

    if (!strcmp(p, "-t")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	cfg.nopty = 0;
	cfg->nopty = 0;
    }
    if (!strcmp(p, "-T")) {
	RETURN(1);
	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
	SAVEABLE(1);
	cfg.nopty = 1;
	cfg->nopty = 1;
    }

    if (!strcmp(p, "-C")) {
	RETURN(1);
	SAVEABLE(1);
	cfg.compression = 1;
	cfg->compression = 1;
    }

    if (!strcmp(p, "-1")) {
	RETURN(1);
	SAVEABLE(1);
	cfg.sshprot = 0;	       /* ssh protocol 1 only */
	cfg->sshprot = 0;	       /* ssh protocol 1 only */
    }
    if (!strcmp(p, "-2")) {
	RETURN(1);
	SAVEABLE(1);
	cfg.sshprot = 3;	       /* ssh protocol 2 only */
	cfg->sshprot = 3;	       /* ssh protocol 2 only */
    }

    if (!strcmp(p, "-i")) {
	RETURN(2);
	SAVEABLE(1);
	strncpy(cfg.keyfile, value, sizeof(cfg.keyfile));
	cfg.keyfile[sizeof(cfg.keyfile)-1] = '\0';
	strncpy(cfg->keyfile, value, sizeof(cfg->keyfile));
	cfg->keyfile[sizeof(cfg->keyfile)-1] = '\0';
    }

    return ret;			       /* unrecognised */
}

void cmdline_run_saved(void)
void cmdline_run_saved(Config *cfg)
{
    int pri, i;
    for (pri = 0; pri < NPRIORITIES; pri++)
	for (i = 0; i < saves[pri].nsaved; i++)
	    cmdline_process_param(saves[pri].params[i].p,
				  saves[pri].params[i].value, 0);
				  saves[pri].params[i].value, 0, cfg);
}