diff options
author | Matthew Newhook <matthew@zeroc.com> | 2009-01-13 17:58:32 -0330 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2009-01-13 17:58:32 -0330 |
commit | efea74327637afce0a7f83b24d8c2f8b1d224f73 (patch) | |
tree | fda54ee1f4361dd3448c96753593fda264ce26cc /cpp/src/slice2html/Gen.cpp | |
parent | Added patch for mcpp 2.7.2 (diff) | |
download | ice-efea74327637afce0a7f83b24d8c2f8b1d224f73.tar.bz2 ice-efea74327637afce0a7f83b24d8c2f8b1d224f73.tar.xz ice-efea74327637afce0a7f83b24d8c2f8b1d224f73.zip |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3640 - If slice2java errors out generated files are left behind
- Added file tracker
- Added calls to file tracker when files or directories are created.
- All translators cleanup created files if interrupted, or if they fail.
- Normalized various error messages.
- Fixed bug with slice2cs which would not correctly check if the impl files were created.
Squashed commit of the following:
commit 0fec143af219d59dcec5b91cb96a79179f73bd0d
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 17:57:25 2009 -0330
Fixed FileException for VC6.
commit 38b22497c751ad9b2f86af2d44e87a23c0049d9c
Merge: df29064... 4421a3d...
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 17:55:49 2009 -0330
Merged R3_3_branch.
commit df290649637685bfff4f777ccf53f4f04fda71a0
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 17:45:18 2009 -0330
move checksum writing outside loop
commit a9bb2356167b1f9259ce2d1f1b43d40b7fd0ce82
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 17:35:00 2009 -0330
added quotes
commit a2f3d7a2414d08ebdc290222b8e97d8b203cc9ab
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 17:21:27 2009 -0330
can't -> cannot
commit c3113e33a3687cae369bf7803e4f1d18c9141762
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 17:10:12 2009 -0330
minor fixes to output.
commit 2a17d6e1b6c0e5eed8be79b8353ca3c06572e19c
Author: U-WIN-5WBK5GD0FYQ\matthew <matthew@WIN-5WBK5GD0FYQ.(none)>
Date: Tue Jan 13 12:05:46 2009 -0800
windows fixes.
commit d8d4f6dc35043fb71b599dac7171fee0c2bb87bf
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 15:58:21 2009 -0330
remove debugging.
commit f1e4d7a55e13fea4c0b84244fb437bd391fbe538
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 15:53:37 2009 -0330
Added FileTracker. Added file tracking, and cleanup to lots of translators.
commit 33dbfb0124509779bd2d95bbac06a02ca9b907ac
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Jan 13 09:42:16 2009 -0330
http://bugzilla/bugzilla/show_bug.cgi?id=3640 If slice2java errors out generated files are left behind
Diffstat (limited to 'cpp/src/slice2html/Gen.cpp')
-rw-r--r-- | cpp/src/slice2html/Gen.cpp | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index d1a56b6ed32..f02ef04b75f 100644 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -7,8 +7,13 @@ // // ********************************************************************** +#if defined(_MSC_VER) && _MSC_VER >= 1400 +# define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated +#endif + #include <IceUtil/DisableWarnings.h> #include <IceUtil/Functional.h> +#include <Slice/FileTracker.h> #include <Gen.h> #include <sys/types.h> @@ -1244,9 +1249,11 @@ Slice::GeneratorBase::openStream(const string& path) _out.open(path.c_str()); if(!_out.isOpen()) { - string err = "cannot open `" + path + "' for writing"; - throw err; + ostringstream os; + os << "cannot open file `" << path << "': " << strerror(errno); + throw FileException(__FILE__, __LINE__, os.str()); } + FileTracker::instance()->addFile(path); } void @@ -1447,18 +1454,28 @@ Slice::GeneratorBase::makeDir(const string& dir) int rc = stat(dir.c_str(), &st); if(rc == 0) { + if(!(st.st_mode & S_IFDIR)) + { + ostringstream os; + os << "failed to create package directory `" << dir + << "': file already exists and is not a directory"; + throw FileException(__FILE__, __LINE__, os.str()); + } return; } + #ifdef _WIN32 - rc = mkdir(dir.c_str()); + rc = _mkdir(dir.c_str()); #else rc = mkdir(dir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); #endif if(rc != 0) { - string err = "cannot create directory `" + dir + "'"; - throw err; + ostringstream os; + os << "cannot create directory `" << dir << "': " << strerror(errno); + throw FileException(__FILE__, __LINE__, os.str()); } + FileTracker::instance()->addDirectory(dir); } string @@ -1467,8 +1484,9 @@ Slice::GeneratorBase::readFile(const string& file) ifstream in(file.c_str()); if(!in) { - string err = "cannot open `" + file + "' for reading"; - throw err; + ostringstream os; + os << "cannot open file `" << file << "': " << strerror(errno); + throw FileException(__FILE__, __LINE__, os.str()); } ostringstream result; @@ -1540,8 +1558,9 @@ Slice::GeneratorBase::readFile(const string& file, string& part1, string& part2) ifstream in(file.c_str()); if(!in) { - string err = "cannot open `" + file + "' for reading"; - throw err; + ostringstream os; + os << "cannot open file `" << file << "': " << strerror(errno); + throw FileException(__FILE__, __LINE__, os.str()); } string line; |