andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nuke some ancient code for commandline-challenged OSes.

Browse Source 
This appears to have been dead code even in 6.7.
This commit is contained in:
Adam Jackson 2008-07-17 10:39:29 -04:00
parent b9a0cee026
commit af2138bfce
3 changed files with 0 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/main.c
View File

@ -252,10 +252,6 @@ int main(int argc, char *argv[], char *envp[])
CheckUserAuthorization();
#ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
ExpandCommandLine(&argc, &argv);
#endif
InitConnectionLimits();
/* prep X authority file from environment; this can be overriden by a

4
include/os.h
View File

@ -402,10 +402,6 @@ extern XID GenerateAuthorization(
unsigned int * /* data_length_return */,
char ** /* data_return */);
#ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
#endif
extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
extern void ddxUseMsg(void);

115
os/utils.c
View File

@ -562,9 +562,6 @@ void UseMsg(void)
ErrorF("-c turns off key-click\n");
ErrorF("c # key-click volume (0-100)\n");
ErrorF("-cc int default color visual class\n");
#ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
ErrorF("-config file read options from file\n");
#endif
ErrorF("-core generate core dump on fatal error\n");
ErrorF("-dpi int screen resolution in dots per inch\n");
#ifdef DPMSExtension
@ -1089,118 +1086,6 @@ ProcessCommandLine(int argc, char *argv[])
}
}
#ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
static void
InsertFileIntoCommandLine(
int *resargc, char ***resargv,
int prefix_argc, char **prefix_argv,
char *filename,
int suffix_argc, char **suffix_argv)
{
struct stat st;
FILE *f;
char *p;
char *q;
int insert_argc;
char *buf;
int len;
int i;
f = fopen(filename, "r");
if (!f)
FatalError("Can't open option file %s\n", filename);
fstat(fileno(f), &st);
buf = (char *) xalloc((unsigned) st.st_size + 1);
if (!buf)
FatalError("Out of Memory\n");
len = fread(buf, 1, (unsigned) st.st_size, f);
fclose(f);
if (len < 0)
FatalError("Error reading option file %s\n", filename);
buf[len] = '\0';
p = buf;
q = buf;
insert_argc = 0;
while (*p)
{
while (isspace(*p))
p++;
if (!*p)
break;
if (*p == '#')
{
while (*p && *p != '\n')
p++;
} else
{
while (*p && !isspace(*p))
*q++ = *p++;
/* Since p and q might still be pointing at the same place, we */
/* need to step p over the whitespace now before we add the null. */
if (*p)
p++;
*q++ = '\0';
insert_argc++;
}
}
buf = (char *) xrealloc(buf, q - buf);
if (!buf)
FatalError("Out of memory reallocing option buf\n");
*resargc = prefix_argc + insert_argc + suffix_argc;
*resargv = (char **) xalloc((*resargc + 1) * sizeof(char *));
if (!*resargv)
FatalError("Out of Memory\n");
memcpy(*resargv, prefix_argv, prefix_argc * sizeof(char *));
p = buf;
for (i = 0; i < insert_argc; i++)
{
(*resargv)[prefix_argc + i] = p;
p += strlen(p) + 1;
}
memcpy(*resargv + prefix_argc + insert_argc,
suffix_argv, suffix_argc * sizeof(char *));
(*resargv)[*resargc] = NULL;
} /* end InsertFileIntoCommandLine */
void
ExpandCommandLine(int *pargc, char ***pargv)
{
int i;
#if !defined(WIN32) && !defined(__CYGWIN__)
if (getuid() != geteuid())
return;
#endif
for (i = 1; i < *pargc; i++)
{
if ( (0 == strcmp((*pargv)[i], "-config")) && (i < (*pargc - 1)) )
{
InsertFileIntoCommandLine(pargc, pargv,
i, *pargv,
(*pargv)[i+1], /* filename */
*pargc - i - 2, *pargv + i + 2);
i--;
}
}
} /* end ExpandCommandLine */
#endif
/* Implement a simple-minded font authorization scheme. The authorization
name is "hp-hostname-1", the contents are simply the host name. */
int