@@ 1392,28 1392,23 @@ atapart(Drive *dp)
* we still check if there is a valid partition table in
* the last sector if none is found in the second last.
*/
-print("R%d|", dp->p[0].end-2);
- ataxfer(dp, &dp->p[0], Cread, dp->p[0].end-2, dp->bytes, buf);
+ i = 0;
+ ataxfer(dp, &dp->p[0], Cread, (dp->p[0].end-2)*dp->bytes, dp->bytes, buf);
buf[dp->bytes-1] = 0;
n = getfields((char*)buf, line, Npart+1, "\n");
- if(n > 0 && strncmp(line[0], PARTMAGIC, sizeof(PARTMAGIC)-1) == 0){
- dp->p[0].end--;
- dp->p[1].start--;
- dp->p[1].end--;
-print("OK%d|", dp->p[1].start);
- }
+ if(n > 0 && strncmp(line[0], PARTMAGIC, sizeof(PARTMAGIC)-1) == 0)
+ i = 1;
else{
-print("r%d|", dp->p[1].start);
ataxfer(dp, &dp->p[1], Cread, 0, dp->bytes, buf);
buf[dp->bytes-1] = 0;
n = getfields((char*)buf, line, Npart+1, "\n");
- if(n == 0 || strncmp(line[0], PARTMAGIC, sizeof(PARTMAGIC)-1)){
- dp->p[0].end--;
- dp->p[1].start--;
- dp->p[1].end--;
-print("nok%d|", dp->p[1].start);
- }
-else print("ok%d|", dp->p[1].start);
+ if(n == 0 || strncmp(line[0], PARTMAGIC, sizeof(PARTMAGIC)-1))
+ i = 1;
+ }
+ if(i){
+ dp->p[0].end--;
+ dp->p[1].start--;
+ dp->p[1].end--;
}
}
else{
@@ 73,7 73,7 @@ enum{
Qclone,
};
Dirtab digesttab[]={
- "digestclone", {Qclone, 0}, 0, 0600,
+ "ssl", {Qclone, 0}, 0, 0600,
};
#define Ndigesttab (sizeof(digesttab)/sizeof(Dirtab))