/[gentoo-src]/Xorgautoconfig/Xorgautoconfig.c
Gentoo

Diff of /Xorgautoconfig/Xorgautoconfig.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.3 Revision 1.4
70 unsigned char *mem; 70 unsigned char *mem;
71 char *macid; 71 char *macid;
72 char *eisaid; 72 char *eisaid;
73 char keyboard_layout[32]; 73 char keyboard_layout[32];
74 memset(keyboard_layout, 0, 32); 74 memset(keyboard_layout, 0, 32);
75 DIR *testdir;
76 char path[256];
75 77
76 if (!(fd = open(name, O_RDONLY))) 78 if (!(fd = open(name, O_RDONLY)))
77 rc = 2; /* Failure */ 79 rc = 2; /* Failure */
78 80
79 if (!rc && ioctl(fd, FBIOGET_FSCREENINFO, &fix)) 81 if (!rc && ioctl(fd, FBIOGET_FSCREENINFO, &fix))
106 else if (!strcmp(argv[args], "--safe")) 108 else if (!strcmp(argv[args], "--safe"))
107 fbdev = fbdepth = 1; 109 fbdev = fbdepth = 1;
108 else if (!strncmp(argv[args], "--keymap=", 9)) { 110 else if (!strncmp(argv[args], "--keymap=", 9)) {
109 strncpy(keyboard_layout, argv[args] + 9 , 29); 111 strncpy(keyboard_layout, argv[args] + 9 , 29);
110 strcat(keyboard_layout, "\"\n"); 112 strcat(keyboard_layout, "\"\n");
113 }
114 else if (!strcmp(argv[args], "--list-keymaps")) {
115 printf("%s", keymap_list);
116 exit(0);
111 } else { 117 } else {
112 usage(); 118 usage();
113 exit(0); 119 exit(0);
114 } 120 }
115 } 121 }
215 /*** BEGIN xorg.conf ***/ 221 /*** BEGIN xorg.conf ***/
216 fprintf(f, "%s", header); 222 fprintf(f, "%s", header);
217 223
218 /* Set fontpaths */ 224 /* Set fontpaths */
219 DIR *fontdir = opendir(FONTPATH); 225 DIR *fontdir = opendir(FONTPATH);
220 DIR *testdir;
221 char path[256];
222 struct dirent *fontpath; 226 struct dirent *fontpath;
223 227
224 /* Add x fontserver note */ 228 /* Add x fontserver note */
225 fprintf(f, "%s", fontpath_xfs); 229 fprintf(f, "%s", fontpath_xfs);
226 if(fontdir != NULL) { 230 if(fontdir != NULL) {

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

  ViewVC Help
Powered by ViewVC 1.1.20