The R Project SVN R

Rev

Rev 42569 | Rev 45667 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 42569 Rev 45446
Line 165... Line 165...
165 
	    }
 165 
	    }
166 
	    else if (!strcmp(*av, "--no-init-file")) {
 166 
	    else if (!strcmp(*av, "--no-init-file")) {
167 
		Rp->LoadInitFile = FALSE;
 167 
		Rp->LoadInitFile = FALSE;
168 
	    }
 168 
	    }
169 
	    else if (!strcmp(*av, "--debug-init")) {
 169 
	    else if (!strcmp(*av, "--debug-init")) {
170 
	        Rp->DebugInitFile = TRUE;
 170 
		Rp->DebugInitFile = TRUE;
171 
	    }
 171 
	    }
172 
	    else if (!strncmp(*av, "--encoding", 10)) {
 172 
	    else if (!strncmp(*av, "--encoding", 10)) {
173 
		if(strlen(*av) < 12) {
 173 
		if(strlen(*av) < 12) {
174 
		    ac--; av++; p = *av;
 174 
		    ac--; av++; p = *av;
175 
		} else p = &(*av)[11];
 175 
		} else p = &(*av)[11];
Line 180... Line 180...
180 
		    R_StdinEnc[30] = '\0';
 180 
		    R_StdinEnc[30] = '\0';
181 
		}
 181 
		}
182 
	    }
 182 
	    }
183 
#ifdef Win32
 183 
#ifdef Win32
184 
	    else if (!strcmp(*av, "--no-Rconsole")) {
 184 
	    else if (!strcmp(*av, "--no-Rconsole")) {
185 
	    	R_LoadRconsole = 0;
 185 
		R_LoadRconsole = 0;
186 
	    }
 186 
	    }
187 
#endif
 187 
#endif
188 
	    else if (!strcmp(*av, "-save") ||
 188 
	    else if (!strcmp(*av, "-save") ||
189 
		     !strcmp(*av, "-nosave") ||
 189 
		     !strcmp(*av, "-nosave") ||
190 
		     !strcmp(*av, "-restore") ||
 190 
		     !strcmp(*av, "-restore") ||
Line 198... Line 198...
198 
		     !strcmp(*av, "-v")) {
 198 
		     !strcmp(*av, "-v")) {
199 
		snprintf(msg, 1024,
 199 
		snprintf(msg, 1024,
200 
			 _("WARNING: option '%s' no longer supported\n"), *av);
 200 
			 _("WARNING: option '%s' no longer supported\n"), *av);
201 
		R_ShowMessage(msg);
 201 
		R_ShowMessage(msg);
202 
	    }
 202 
	    }
203 
            /* mop up --max/min/-n/vsize */
 203 
	    /* mop up --max/min/-n/vsize */
204 
 	    else if(strncmp(*av+7, "size", 4) == 0) {
 204 
	    else if(strncmp(*av+7, "size", 4) == 0) {
205 
		if(strlen(*av) < 13) {
 205 
		if(strlen(*av) < 13) {
206 
		    ac--; av++; p = *av;
 206 
		    ac--; av++; p = *av;
207 
		}
 207 
		}
208 
		else p = &(*av)[12];
 208 
		else p = &(*av)[12];
209 
		if (p == NULL) {
 209 
		if (p == NULL) {