← Back to branch summary

~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): Nick Andrik
  • Date: 2013-01-21 23:07:40 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20130121230740-yky1izwyj5x16wq1
Tags: 1:4.2.4-0.1
http://bugs.debian.org/687839
http://bugs.debian.org/485492
https://launchpad.net/bugs/390263
http://bugs.debian.org/694611
* Non-maintainer upload

* New upstream release (Closes: #687839)

* Add shared library binary and headers packages
  - Add entries into control file
  - Add libunrar0.{install,link,symbols} files
  - Add libunrar0-dev.install file
  - Patch missing binary object targets for library building
    (fix_missing_symbols)
  - Rename previous unrar-nonfree.{1,dirs,install,prerm,postint} file to
    unrar.* ones
  - Make sure libunrar.so is built (Closes: #485492, LP: #390263)
* Converted package to CDBS:
  - Simplified rules file
  - Added cdbs build-deps
* Added hardening support (Closes: #694611)
  - Updated compatibility version to 9
  - Added versioned dpkg-dev build-dep
* Updated copyright information:
  - Machine-readable format
  - Added missing files/licenses
* General maintentance:
  - Moved the homepage field in cortol file to the appropriate place
  - Bumped standards version to 3.9.4
  - Remove versioned conflict dependency

Show diffs side-by-side

added added

removed removed

Lines of Context:
rar.cpp
43
43
#endif
44
44
 
45
45
#if defined(_WIN_ALL) && !defined(SFX_MODULE) && !defined(SHELL_EXT)
46
 
  bool ShutdownOnClose;
 
46
  // Must be initialized, normal initialization can be skipped in case of
 
47
  // exception.
 
48
  bool ShutdownOnClose=false;
47
49
#endif
48
50
 
49
51
#ifdef ALLOW_EXCEPTIONS
78
80
          Cmd.Command[0]=UpperCmd;
79
81
          break;
80
82
        case '?':
81
 
          Cmd.OutHelp();
 
83
          Cmd.OutHelp(RARX_SUCCESS);
82
84
          break;
83
85
      }
84
86
    }
107
109
    Cmd.ProcessCommand();
108
110
  }
109
111
#ifdef ALLOW_EXCEPTIONS
110
 
  catch (int ErrCode)
 
112
  catch (RAR_EXIT ErrCode)
111
113
  {
112
114
    ErrHandler.SetErrorCode(ErrCode);
113
115
  }
114
116
#ifdef ENABLE_BAD_ALLOC
115
 
  catch (bad_alloc)
 
117
  catch (std::bad_alloc)
116
118
  {
117
 
    ErrHandler.SetErrorCode(MEMORY_ERROR);
 
119
    ErrHandler.MemoryErrorMsg();
 
120
    ErrHandler.SetErrorCode(RARX_MEMORY);
118
121
  }
119
122
#endif
120
123
  catch (...)
121
124
  {
122
 
    ErrHandler.SetErrorCode(FATAL_ERROR);
 
125
    ErrHandler.SetErrorCode(RARX_FATAL);
123
126
  }
124
127
#endif
125
128