← Back to branch summary

~ubuntu-branches/ubuntu/trusty/util-linux/trusty-proposed

« back to all changes in this revision

Viewing changes to text-utils/hexdump.c

  • Committer: Package Import Robot
  • Author(s): LaMont Jones, Roger Leigh, LaMont Jones, 김종규, Niels Thykier
  • Date: 2011-11-03 15:38:23 UTC
  • mfrom: (1.7.2)
  • mto: This revision was merged to the branch mainline in revision 85.
  • Revision ID: package-import@ubuntu.com-20111103153823-n2nt15ce74gyvnaa
Tags: 2.20.1-1
http://bugs.debian.org/632421
http://bugs.debian.org/632425
http://bugs.debian.org/648467
* New upstream

[Roger Leigh]

* Various merge fixes [with edits - lamont]
  - drop old unused patches
  - cleanup debian/rules
  - updated symbols files for lib{blkid,mount,uuid}1

[LaMont Jones]

* merge in 2.19.1-{3..5}
* deliver /etc/fstab.d

[김종규]

* add korean debconf pofile.  Closes: #632421, #632425

[Niels Thykier]

* Add build-arch and build-indep targets.  Closes: #648467

Show diffs side-by-side

added added

removed removed

Lines of Context:
text-utils/hexdump.c
38
38
#include <sys/types.h>
39
39
#include <stdio.h>
40
40
#include <string.h>
 
41
#include <stdlib.h>
41
42
#include "hexdump.h"
 
43
 
42
44
#include "nls.h"
 
45
#include "c.h"
43
46
 
44
47
FS *fshead;                             /* head of format strings */
45
48
int blocksize;                          /* data block size */
57
60
 
58
61
        if (!(p = strrchr(argv[0], 'o')) || strcmp(p, "od")) {
59
62
                newsyntax(argc, &argv);
60
 
        } else {
61
 
                fprintf(stderr,
62
 
                        _("Calling hexdump as od has been deprecated in favour to GNU coreutils od.\n"));
63
 
                return(1);
64
 
        }
 
63
        } else
 
64
                errx(EXIT_FAILURE, _("calling hexdump as od has been deprecated "
 
65
                                     "in favour to GNU coreutils od."));
65
66
 
66
67
        /* figure out the data block size */
67
68
        for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {