- Timestamp:
- Dec 2, 2011, 9:39:03 AM (12 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r593 r594 1 2011-12-02 <rybkin@lal.in2p3.fr> 471 2 3 * source/cmt_system.cxx: In class CmtSystem functions, add cmt name into 4 system functions error messages, rename helper function to get_absolute_path 5 1 6 2011-12-01 <rybkin@lal.in2p3.fr> 470 2 7 -
CMT/HEAD/source/cmt_system.cxx
r592 r594 58 58 if (NULL == ::getcwd (dir, sizeof (dir))) 59 59 { 60 perror (" getcwd failure");60 perror ("cmt: getcwd failure"); 61 61 return NULL; 62 62 } … … 91 91 if (NULL == ::getcwd (buffer, sizeof (buffer))) 92 92 { 93 perror (" getcwd failure");93 perror ("cmt: getcwd failure"); 94 94 static const cmt_string empty; 95 95 return empty; … … 101 101 const char* t = &buffer[0]; 102 102 return ((cmt_string) t); 103 } 104 105 //-------------------------------------------------- 106 static cmt_string get_absolute_path (const cmt_string& name) 107 { 108 cmt_string path; 109 if (CmtSystem::absolute_path (name)) 110 { 111 path = name; 112 } 113 else 114 { 115 char buffer[PATH_MAX]; 116 if (NULL == ::getcwd (buffer, sizeof (buffer))) 117 { 118 perror ("cmt: getcwd failure"); 119 path = name; 120 } 121 else 122 { 123 path += buffer; 124 path += CmtSystem::file_separator (); 125 path += name; 126 } 127 } 128 CmtSystem::compress_path (path); 129 return path; 103 130 } 104 131 … … 140 167 #endif 141 168 ) 142 perror ("c hdir failure: " + s_dir);169 perror ("cmt: chdir failure: " + get_absolute_path (s_dir)); 143 170 return (false); 144 171 } … … 297 324 298 325 //-------------------------------------------------- 299 static cmt_string get_full_path (const cmt_string& name)300 {301 cmt_string path;302 if (CmtSystem::absolute_path (name)) return name;303 else304 {305 char buffer[PATH_MAX];306 if (NULL == ::getcwd (buffer, sizeof (buffer)))307 {308 perror ("getcwd failure");309 path = name;310 }311 else312 {313 path += buffer;314 path += CmtSystem::file_separator ();315 path += name;316 }317 }318 return path;319 }320 321 //--------------------------------------------------322 326 bool CmtSystem::realpath_ (const cmt_string& path, cmt_string& result) 323 327 { … … 332 336 if (NULL == ::getcwd (buffer, sizeof (buffer))) 333 337 { 334 perror (" getcwd failure: " + get_full_path (path));338 perror ("cmt: getcwd failure: " + get_absolute_path (path)); 335 339 return false; 336 340 } … … 420 424 if (errno != ENOENT) 421 425 { 422 perror (" stat failure: " + get_full_path (name));423 CmtError::set (CmtError::file_access_error, get_ full_path (name));426 perror ("cmt: stat failure: " + get_absolute_path (name)); 427 CmtError::set (CmtError::file_access_error, get_absolute_path (name)); 424 428 } 425 429 return (false); … … 450 454 if (errno != ENOENT) 451 455 { 452 perror (" stat failure: " + get_full_path (name));453 CmtError::set (CmtError::file_access_error, get_ full_path (name));456 perror ("cmt: stat failure: " + get_absolute_path (name)); 457 CmtError::set (CmtError::file_access_error, get_absolute_path (name)); 454 458 } 455 459 return (false); … … 478 482 if (errno != ENOENT) 479 483 { 480 perror (" stat failure: " + get_full_path (name1));481 CmtError::set (CmtError::file_access_error, get_ full_path (name1));484 perror ("cmt: stat failure: " + get_absolute_path (name1)); 485 CmtError::set (CmtError::file_access_error, get_absolute_path (name1)); 482 486 } 483 487 return (false); … … 497 501 if (errno != ENOENT) 498 502 { 499 perror (" stat failure: " + get_full_path (name2));500 CmtError::set (CmtError::file_access_error, get_ full_path (name2));503 perror ("cmt: stat failure: " + get_absolute_path (name2)); 504 CmtError::set (CmtError::file_access_error, get_absolute_path (name2)); 501 505 } 502 506 return (false); … … 594 598 { 595 599 if (errno != ENOENT) 596 perror (" stat failure: " + get_full_path (name1));600 perror ("cmt: stat failure: " + get_absolute_path (name1)); 597 601 // name1 does not exist 598 602 return (false); … … 628 632 else 629 633 { 630 if (errno != ENOENT) 631 perror ("unlink failure: " + get_full_path (name1)); 634 perror ("cmt: unlink failure: " + get_absolute_path (name1)); 632 635 return (false); 633 636 } … … 639 642 if (errno != ENOENT) 640 643 { 641 perror (" stat failure: " + get_full_path (name2));644 perror ("cmt: stat failure: " + get_absolute_path (name2)); 642 645 return (false); 643 646 } … … 658 661 else 659 662 { 660 if (errno != ENOENT) 661 { 662 perror ("unlink failure: " + get_full_path (name1)); 663 return (false); 664 } 665 return (true); 663 perror ("cmt: unlink failure: " + get_absolute_path (name1)); 664 return (false); 666 665 } 667 666 } … … 692 691 if (errno != ENOENT) 693 692 { 694 perror (" stat failure: " + get_full_path (name));695 return (-1);693 perror ("cmt: stat failure: " + get_absolute_path (name)); 694 return -1; 696 695 } 697 696 return (0); … … 784 783 && errno != ENOENT) 785 784 { 786 perror (" unlink failure: " + get_full_path (newname));785 perror ("cmt: unlink failure: " + get_absolute_path (newname)); 787 786 return (false); 788 787 } … … 798 797 { 799 798 #ifndef WIN32 800 perror (" symlink failure: " + newname + "->" + oldname);799 perror ("cmt: symlink failure: " + newname + "->" + oldname); 801 800 #endif 802 801 return (false); … … 816 815 // cerr << "#CMT> Cannot remove file " << name << endl; 817 816 if (errno != ENOENT) 818 perror (" unlink failure: " + get_full_path (name));817 perror ("cmt: unlink failure: " + get_absolute_path (name)); 819 818 return (false); 820 819 } … … 849 848 if (status != 0) 850 849 { 851 perror (" rmdir failure: " + name);850 perror ("cmt: rmdir failure: " + get_absolute_path (name)); 852 851 char num[32]; sprintf (num, "%d", errno); 853 852 CmtMessage::error ("Cannot remove directory " + name + " errno=" + num); … … 913 912 { 914 913 // cerr << "CMT> cannot create directory " << full_path << endl; 915 perror (" mkdir failure: " + full_path);914 perror ("cmt: mkdir failure: " + full_path); 916 915 return (false); 917 916 } … … 1311 1310 else 1312 1311 { 1313 perror (" uname failure");1312 perror ("cmt: uname failure"); 1314 1313 } 1315 1314 … … 1361 1360 if ((ptr = ::tmpnam (NULL)) == NULL) 1362 1361 { 1363 perror (" tmpnam failure");1362 perror ("cmt: tmpnam failure"); 1364 1363 static const cmt_string empty; 1365 1364 return empty; … … 1498 1497 CmtMessage::error ("putenv failure: " + v); 1499 1498 #else 1500 perror (" putenv failure: " + v);1499 perror ("cmt: putenv failure: " + v); 1501 1500 #endif 1502 1501 return (false); … … 1841 1840 if (status == -1) // error reported by pclose () 1842 1841 { 1843 perror (" pclose failure");1842 perror ("cmt: pclose failure"); 1844 1843 if (errno == ECHILD) 1845 1844 {
Note: See TracChangeset
for help on using the changeset viewer.