~ubuntu-branches/ubuntu/wily/unrar-nonfree/wily-proposed

« back to all changes in this revision

Viewing changes to rar.cpp

  • Committer: Package Import Robot
  • Author(s): Martin Meredith
  • Date: 2012-02-14 22:39:32 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20120214223932-wi7jd1zvqed61bw2
Tags: 1:4.1.4-1
* New upstream release
* Updated Watch file
* Added build-indep and build-arch to rules file

Show diffs side-by-side

added added

removed removed

Lines of Context:
83
83
      }
84
84
    }
85
85
    Cmd.AddArcName(ModuleNameA,ModuleNameW);
86
 
#else
87
 
    if (Cmd.IsConfigEnabled(argc,argv))
 
86
    Cmd.ParseDone();
 
87
#else // !SFX_MODULE
 
88
    Cmd.PreprocessCommandLine(argc,argv);
 
89
    if (!Cmd.ConfigDisabled)
88
90
    {
89
 
      Cmd.ReadConfig(argc,argv);
 
91
      Cmd.ReadConfig();
90
92
      Cmd.ParseEnvVar();
91
93
    }
92
 
    for (int I=1;I<argc;I++)
93
 
      Cmd.ParseArg(argv[I],NULL);
 
94
    Cmd.ParseCommandLine(argc,argv);
94
95
#endif
95
 
    Cmd.ParseDone();
96
96
 
97
97
#if defined(_WIN_ALL) && !defined(SFX_MODULE) && !defined(SHELL_EXT)
98
98
    ShutdownOnClose=Cmd.Shutdown;
122
122
    ErrHandler.SetErrorCode(FATAL_ERROR);
123
123
  }
124
124
#endif
 
125
 
125
126
  File::RemoveCreated();
126
127
#if defined(SFX_MODULE) && defined(_DJGPP)
127
128
  _chmod(ModuleNameA,1,0x20);