~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to util/grub-fstest.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
ImportĀ upstreamĀ versionĀ 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
111
111
  file = grub_file_open (pathname);
112
112
  if (!file)
113
113
    {
114
 
      grub_util_error (_("cannot open file %s"), pathname);
 
114
      grub_util_error (_("cannot open file %s:%s"), pathname,
 
115
                       grub_errmsg);
115
116
      return;
116
117
    }
117
118
 
221
222
    grub_util_error (_("seek error"));
222
223
 
223
224
  read_file (src, cmp_hook);
 
225
 
 
226
  {
 
227
    grub_uint64_t pre;
 
228
    pre = ftell (ff);
 
229
    fseek (ff, 0, SEEK_END);
 
230
    if (pre != ftell (ff))
 
231
      grub_util_error (_("unexpected end of file"));
 
232
  }
224
233
  fclose (ff);
225
234
}
226
235