From: Michael Meffie Date: Tue, 20 Sep 2011 20:21:50 +0000 (-0400) Subject: salvager: fix filesystem path truncation X-Git-Tag: upstream/1.6.1.pre1^2~215 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b26ed0b20c0c5ff2b06314d28f0df3f1357dd8f9;p=packages%2Fo%2Fopenafs.git salvager: fix filesystem path truncation Fix filesystem path truncation for vice partitions beyond /vicepz. Commit 3d7388b7 moved the filesystem path to a fixed size buffer, however the path of the filesystem to be salvaged is truncated for partitions with two character ids (e.g. /vicepaa), in which case the salvager will salvager the wrong partition, or abort if the truncated path is not present. (cherry picked from commit 1e487f6026fb559638fab256362dbda9d4b4a8b1) Change-Id: I1f69b580e4db59f9e8dc245348ede176fc1d23c1 Reviewed-on: http://gerrit.openafs.org/5474 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index c794cfa65..13ed71bb8 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -272,7 +272,7 @@ FILE *logFile = 0; /* one of {/usr/afs/logs,/vice/file}/SalvageLog */ struct SalvInfo { Device fileSysDevice; /**< The device number of the current partition * being salvaged */ - char fileSysPath[8]; /**< The path of the mounted partition currently + char fileSysPath[9]; /**< The path of the mounted partition currently * being salvaged, i.e. the directory containing * the volume headers */ char *fileSysPathName; /**< NT needs this to make name pretty log. */