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

« back to all changes in this revision

Viewing changes to misc-utils/cal.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2010-03-22 17:35:40 UTC
  • mfrom: (1.6.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100322173540-sm083tdtvne1wa5w
Tags: 2.17.2-0ubuntu1
* Merge from Debian experimental, remaining changes:
  - Since udev is required in Ubuntu, the hwclock.sh init script is
    not called on startup and the hwclockfirst.sh init script is
    removed.
  - Use wildcards for symbols file, since they use versioned symbols
    properly.
  - Remove /etc/adjtime on upgrade if it was not used.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - No lsb_release call in mount.preinst since we'd need Pre-Depends
    (LP: #383697).
  - Do not install initramfs hook, since our initramfs already handles
    including blkid.
  - Mention mountall(8) in fstab(5) manpages, along with its special
    options.

* For the case where mount is called with a directory to mount, look
  that directory up in mountall's /lib/init/fstab if we couldn't find
  it mentioned anywhere else.  This means "mount /proc", "mount /sys",
  etc. work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
312
312
         POSIX:  19971201 + 7 -1 = 0
313
313
         */
314
314
        {
315
 
                int wfd = (int)(intptr_t) nl_langinfo(_NL_TIME_WEEK_1STDAY);
 
315
                int wfd;
 
316
                union { unsigned int word; char *string; } val;
 
317
                val.string = nl_langinfo(_NL_TIME_WEEK_1STDAY);
 
318
 
 
319
                wfd = val.word;
316
320
                wfd = day_in_week(wfd % 100, (wfd / 100) % 100, wfd / (100 * 100));
317
321
                weekstart = (wfd + *nl_langinfo(_NL_TIME_FIRST_WEEKDAY) - 1) % 7;
318
322
        }