Magellan Linux

Diff of /trunk/mkinitrd-magellan/klibc/usr/kinit/kinit.c

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

revision 1121 by niro, Sat Sep 1 22:45:15 2007 UTC revision 1122 by niro, Wed Aug 18 21:11:40 2010 UTC
# Line 19  const char *progname = "kinit"; Line 19  const char *progname = "kinit";
19  int mnt_procfs;  int mnt_procfs;
20  int mnt_sysfs;  int mnt_sysfs;
21    
22  #ifdef INI_DEBUG  #ifdef DEBUG
23  void dump_args(int argc, char *argv[])  void dump_args(int argc, char *argv[])
24  {  {
25   int i;   int i;
# Line 32  void dump_args(int argc, char *argv[]) Line 32  void dump_args(int argc, char *argv[])
32    
33   if (argv[argc] != NULL) {   if (argv[argc] != NULL) {
34   printf("  argv[%d]: \"%s\" (SHOULD BE NULL)\n",   printf("  argv[%d]: \"%s\" (SHOULD BE NULL)\n",
35         argc, argv[argc]);   argc, argv[argc]);
36   }   }
37  }  }
38  #endif  #endif /* DEBUG */
39    
40    
41  static int do_ipconfig(int argc, char *argv[])  static int do_ipconfig(int argc, char *argv[])
# Line 50  static int do_ipconfig(int argc, char *a Line 50  static int do_ipconfig(int argc, char *a
50   args[a++] = (char *)"-i";   args[a++] = (char *)"-i";
51   args[a++] = (char *)"Linux kinit";   args[a++] = (char *)"Linux kinit";
52    
53   DEBUG(("Running ipconfig\n"));   dprintf("Running ipconfig\n");
54    
55   for (i = 1; i < argc; i++) {   for (i = 1; i < argc; i++) {
56   if (strncmp(argv[i], "ip=", 3) == 0 ||   if (strncmp(argv[i], "ip=", 3) == 0 ||
# Line 173  static const char *find_init(const char Line 173  static const char *find_init(const char
173   }   }
174    
175   if (user)   if (user)
176   DEBUG(("Checking for init: %s\n", user));   dprintf("Checking for init: %s\n", user);
177    
178   if (user && user[0] == '/' && !access(user+1, X_OK)) {   if (user && user[0] == '/' && !access(user+1, X_OK)) {
179   path = user;   path = user;
180   } else {   } else {
181   for (p = init_paths; *p; p++) {   for (p = init_paths; *p; p++) {
182   DEBUG(("Checking for init: %s\n", *p));   dprintf("Checking for init: %s\n", *p);
183   if (!access(*p+1, X_OK))   if (!access(*p+1, X_OK))
184   break;   break;
185   }   }

Legend:
Removed from v.1121  
changed lines
  Added in v.1122