← Back to branch summary

~ubuntu-branches/ubuntu/natty/procps/natty-proposed

« back to all changes in this revision

Viewing changes to ps/sortformat.c

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-06-03 07:28:56 UTC
  • mfrom: (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090603072856-zbj1y7nvc1bquf1o
Tags: 1:3.2.8-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/rules (Ubuntu-specific):
    - set init script to priority 17.
    - install sysctl files from new sysctl.d directory.
    - append debian/sysctl.d/*.conf.$DEB_HOST_ARCH to 10-arch-specific.conf
  - debian/sysctl.d (Ubuntu-specific):
    - 10-console-messages.conf: stop low-level kernel messages on console.
    - 10-network-security.conf: enable rp_filter and SYN-flood protection.
    - 10-keyboard.conf.powerpc: mouse button emulation on PowerPC.
  - Drop conf-file-cleanups in debian/{preinst,postinst,postrm}.
  - Drop pre-Hardy rcS.d procps.sh cleanups in debian/postinst.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ps/sortformat.c
325
325
  if(*spec == '-'){
326
326
    reverse = 1;
327
327
    spec++;
 
328
  } else if(*spec == '+'){
 
329
    spec++;
328
330
  }
329
331
  fs = search_format_array(spec);
330
332
  if(fs){