438 2002-01-23 16:17:49 +0300 Options for isofs does not recognized after \'iocharset\' 2003-08-25 15:18:27 +0400 1 1 4 Development Sisyphus kernel24-up unstable all Linux CLOSED FIXED P4 minor --- 1 vyt nidd oldest_to_newest 415 0 vyt 2002-01-23 16:17:49 +0300 Строка mount -t auto /dev/cdrom /mnt/tmp -o session=0,iocharset=koi8-r,ro,showexec работает, а строка mount -t auto /dev/cdrom /mnt/tmp -o iocharset=koi8-r,ro,showexec,session=0 не работает. --- --- 3055 1 reporter 2002-03-07 19:21:01 +0300 Will be fixed in 2.4.18-alt2, here is the patch (replace with it linux-2.4.6-iso9660opt.patch --- --- inode.c.orig Thu Mar 7 18:41:45 2002 +++ inode.c Thu Mar 7 19:35:03 2002 @@ -295,6 +295,8 @@ popt->sbsector=-1; if (!options) return 1; for (this_char = strtok(options,\",\"); this_char; this_char = strtok(NULL,\",\")) { + if (!this_char) + return 1; if (strncmp(this_char,\"norock\",6) == 0) { popt->rock = \'n\'; continue; @@ -340,13 +342,13 @@ else if (!strcmp(value,\"acorn\")) popt->map = \'a\'; else return 0; } - if (!strcmp(this_char,\"session\") && value) { + else if (!strcmp(this_char,\"session\") && value) { char * vpnt = value; unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0); if(ivalue < 0 || ivalue >99) return 0; popt->session=ivalue+1; } - if (!strcmp(this_char,\"sbsector\") && value) { + else if (!strcmp(this_char,\"sbsector\") && value) { char * vpnt = value; unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0); if(ivalue < 0 || ivalue >660*512) return 0; @@ -396,7 +398,7 @@ break; } } - else return 1; + else continue; } return 1; } --- 6420 2 reporter 2002-03-07 19:21:01 +0300 Will be fixed in 2.4.18-alt2, here is the patch (replace with it linux-2.4.6-iso9660opt.patch --- --- inode.c.orig Thu Mar 7 18:41:45 2002 +++ inode.c Thu Mar 7 19:35:03 2002 @@ -295,6 +295,8 @@ popt->sbsector=-1; if (!options) return 1; for (this_char = strtok(options,\",\"); this_char; this_char = strtok(NULL,\",\")) { + if (!this_char) + return 1; if (strncmp(this_char,\"norock\",6) == 0) { popt->rock = \'n\'; continue; @@ -340,13 +342,13 @@ else if (!strcmp(value,\"acorn\")) popt->map = \'a\'; else return 0; } - if (!strcmp(this_char,\"session\") && value) { + else if (!strcmp(this_char,\"session\") && value) { char * vpnt = value; unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0); if(ivalue < 0 || ivalue >99) return 0; popt->session=ivalue+1; } - if (!strcmp(this_char,\"sbsector\") && value) { + else if (!strcmp(this_char,\"sbsector\") && value) { char * vpnt = value; unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0); if(ivalue < 0 || ivalue >660*512) return 0; @@ -396,7 +398,7 @@ break; } } - else return 1; + else continue; } return 1; } ---