← Back to branch summary

~ubuntu-branches/ubuntu/utopic/busybox/utopic

« back to all changes in this revision

Viewing changes to coreutils/cal.c

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2012-05-01 03:35:20 UTC
  • mfrom: (2.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20120501033520-3nb8wjf4bp524txp
Tags: 1:1.19.3-7ubuntu1
* Merge from Debian unstable, remaining changes:
  - [udeb] Enable chvt, killall, losetup, NFS mount, od, ping, ping6, and
    stat.
  - [deb, static] Enable CGI support for httpd.
  - Enable 'mount -f' and mount helpers for all targets.
  - Add busybox-initramfs.
  - test-bin.patch: Move test and friends to /bin.
  - static-sh-alias.patch: Add static-sh alias name for ash, and install
    /bin/static-sh symlink to busybox in busybox-static.
  - debian/patches/fix-64-bit-permissions.patch: mkdir: fix permissions
    on 64-bit platforms.  Taken from upstream.
  - Filter out -Werror=format-security from CFLAGS passed by
    dpkg-buildpackage, at least for now.
* Dropped changes, included in Debian:
  - [deb] Enable mdev.
  - Add cross-compiling support.
* Disable NFS mount in the static build; needs a newer upstream version of
  busybox for compatibility with glibc 2.15.
* Set V=1 in debian/rules, to get more meaningful build logs.
* Export the dpkg-buildflags to the environment, so we pick up hardening
  now that dpkg doesn't export them for us.

Show diffs side-by-side

added added

removed removed

Lines of Context:
coreutils/cal.c
16
16
 *
17
17
 * Major size reduction... over 50% (>1.5k) on i386.
18
18
 */
 
19
 
 
20
//usage:#define cal_trivial_usage
 
21
//usage:       "[-jy] [[MONTH] YEAR]"
 
22
//usage:#define cal_full_usage "\n\n"
 
23
//usage:       "Display a calendar\n"
 
24
//usage:     "\n        -j      Use julian dates"
 
25
//usage:     "\n        -y      Display the entire year"
 
26
 
19
27
#include "libbb.h"
20
28
#include "unicode.h"
21
29
 
138
146
                        if (julian)
139
147
                                *hp++ = ' ';
140
148
                        {
141
 
                                char *two_wchars = unicode_conv_to_printable_fixedwidth(NULL, buf, 2);
 
149
                                char *two_wchars = unicode_conv_to_printable_fixedwidth(/*NULL,*/ buf, 2);
142
150
                                strcpy(hp, two_wchars);
143
151
                                free(two_wchars);
144
152
                        }