Changeset 17206

Timestamp:

06/16/11 15:23:51 (2 years ago)

Author:

BrainSlayer

Message:

new x86 code

File:

• src/router/services/services/usb_hotplug.c (modified) (3 diffs)

src/router/services/services/usb_hotplug.c

@@ -29 +29 @@
 {
         int i;
-        unsigned char *disks[]={"/dev/sda2","/dev/sdb2","/dev/sdc2","/dev/sdd2","/dev/sde2","/dev/sdf2","/dev/sdg2","/dev/sdh2","/dev/sdi2"};
+        static char ret[4];
+        unsigned char *disks[]={"sda2","sdb2","sdc2","sdd2","sde2","sdf2","sdg2","sdh2","sdi2"};
         for (i = 0; i < 9; i++) {
                 char dev[64];
 
-                strcpy(dev, disks[i]);
+                sprintf(dev, "/dev/%s", disks[i]);
                 FILE *in = fopen(dev, "rb");
 
@@ -46 +47 @@
                         fclose(in);
                         // filesystem detected
-                        return disks[i];
+                        strncpy(ret,disks[i],3);
+                        return ret;
                 }
                 fclose(in);
@@ -248 +250 @@
 #ifdef HAVE_X86
                         char check[32];
-                        sprintf("disc%d", getdiscindex());
+                        strcpy(check, getdisc());
                         if (!strncmp(entry->d_name, check, 5)) {
                                 fprintf(stderr,