← Back to branch summary

~ubuntu-branches/debian/lenny/ecryptfs-utils/lenny

« back to all changes in this revision

Viewing changes to src/libecryptfs/cmd_ln_parser.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2008-10-24 06:42:00 UTC
  • mfrom: (1.1.11 upstream)
  • mto: This revision was merged to the branch mainline in revision 10.
  • Revision ID: james.westby@ubuntu.com-20081024064200-oh6xmd4e4ogs7m2l
Tags: 63-1
Merging upstream version 63.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libecryptfs/cmd_ln_parser.c
373
373
        struct stat filestat;
374
374
 
375
375
        rc = fstat(fd, &filestat);
376
 
        if (rc)
 
376
        if (rc) {
 
377
                syslog(LOG_ERR, "%s: fstat returned [%d] on fd [%d]\n",
 
378
                       __FUNCTION__, rc, fd);
377
379
                goto out;
 
380
        }
378
381
        pagesize = getpagesize();
379
382
        file_size = filestat.st_size;
380
383
        if (file_size > MAX_FILE_SIZE) {
389
392
        data = mmap((caddr_t)0, file_size, PROT_READ, MAP_PRIVATE, fd, 0);
390
393
        if (data == MAP_FAILED) {
391
394
                rc = errno;
 
395
                syslog(LOG_ERR, "%s: mmap failed on fd [%d]; rc = [%d]\n",
 
396
                       __FUNCTION__, fd, rc);
392
397
                goto out;
393
398
        }
394
399
        rc = generate_nv_list(head, data);