~ubuntu-branches/ubuntu/precise/iproute/precise

« back to all changes in this revision

Viewing changes to ip/ip.c

  • Committer: Bazaar Package Importer
  • Author(s): Fabio M. Di Nitto
  • Date: 2007-06-11 13:31:12 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070611133112-0rtfv32yfs8loo0r
Tags: 20070313-1ubuntu1
* Merge from debian unstable, remaining changes:
  - linux-kernel-headers -> linux-libc-dev B-D rename.
  - MAX_ROUNDS patch to ip/ipaddress.c
  - Ubuntu maintainer foobar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
145
145
                basename = argv[0];
146
146
        else
147
147
                basename++;
148
 
        
 
148
 
149
149
        while (argc > 1) {
150
150
                char *opt = argv[1];
151
151
                if (strcmp(opt,"--") == 0) {
220
220
 
221
221
        _SL_ = oneline ? "\\" : "\n" ;
222
222
 
223
 
        if (batch_file) 
 
223
        if (batch_file)
224
224
                return batch(batch_file);
225
 
                
 
225
 
226
226
        if (rtnl_open(&rth, 0) < 0)
227
227
                exit(1);
228
228
 
229
 
        if (strlen(basename) > 2) 
 
229
        if (strlen(basename) > 2)
230
230
                return do_cmd(basename+2, argc, argv);
231
231
 
232
 
        if (argc > 1) 
 
232
        if (argc > 1)
233
233
                return do_cmd(argv[1], argc-1, argv+1);
234
234
 
235
235
        rtnl_close(&rth);