69 |
|
while (isspace(*s)) |
70 |
|
s++; |
71 |
|
if (*s == '-') { /* command line parameters */ |
72 |
< |
copystruct(&nv, &ourview); |
72 |
> |
nv = ourview; |
73 |
|
if (sscanview(&nv, s)) |
74 |
|
newview(&nv); |
75 |
|
else |
171 |
|
VIEW nv; |
172 |
|
|
173 |
|
if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ |
174 |
< |
copystruct(&nv, &stdview); |
174 |
> |
nv = stdview; |
175 |
|
if ((fname = getpath(buf, "", R_OK)) == NULL || |
176 |
|
(success = viewfile(fname, &nv, NULL)) == -1) { |
177 |
|
sprintf(errmsg, "cannot open \"%s\"", buf); |
188 |
|
error(COMMAND, "no previous view"); |
189 |
|
return; |
190 |
|
} |
191 |
< |
copystruct(&nv, &ourview); |
192 |
< |
copystruct(&ourview, &oldview); |
193 |
< |
copystruct(&oldview, &nv); |
191 |
> |
nv = ourview; |
192 |
> |
ourview = oldview; |
193 |
> |
oldview = nv; |
194 |
|
newimage(); |
195 |
|
} |
196 |
|
|
265 |
|
buf[0] = '\0'; |
266 |
|
fgets(buf, sizeof(buf), fp); |
267 |
|
pclose(fp); |
268 |
< |
copystruct(&nv, &stdview); |
268 |
> |
nv = stdview; |
269 |
|
if (!sscanview(&nv, buf)) { |
270 |
|
error(COMMAND, "rad error -- no such view?"); |
271 |
|
return; |