Fix g++ 4.3 issues; add missing <cstring> includes, remove storage class on explicit...

[synfig.git] / synfig-core / trunk / src / tool / main.cpp

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index d74f3cf..66efb3c 100644 (file)
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -35,6 +35,7 @@
 #include <list>
 #include <ETL/clock>
 #include <algorithm>
+#include <cstring>
 
 #include <synfig/loadcanvas.h>
 #include <synfig/savecanvas.h>
@@ -57,18 +58,21 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
+#undef _
+#define _(x) gettext(x)
+
 enum exit_code
 {
-       SYNFIGTOOL_OK                           =0,
-       SYNFIGTOOL_FILENOTFOUND         =1,
-       SYNFIGTOOL_BORRED                       =2,
-       SYNFIGTOOL_HELP                         =3,
-       SYNFIGTOOL_UNKNOWNARGUMENT      =4,
-       SYNFIGTOOL_UNKNOWNERROR         =5,
-       SYNFIGTOOL_INVALIDTARGET                =6,
-       SYNFIGTOOL_RENDERFAILURE                =7,
-       SYNFIGTOOL_BLANK                                =8,
-       SYNFIGTOOL_BADVERSION           =9,
+       SYNFIGTOOL_OK                           = 0,
+       SYNFIGTOOL_FILENOTFOUND         = 1,
+       SYNFIGTOOL_BORED                        = 2,
+       SYNFIGTOOL_HELP                         = 3,
+       SYNFIGTOOL_UNKNOWNARGUMENT      = 4,
+       SYNFIGTOOL_UNKNOWNERROR         = 5,
+       SYNFIGTOOL_INVALIDTARGET        = 6,
+       SYNFIGTOOL_RENDERFAILURE        = 7,
+       SYNFIGTOOL_BLANK                        = 8,
+       SYNFIGTOOL_BADVERSION           = 9,
        SYNFIGTOOL_MISSINGARGUMENT      =10
 };
 
@@ -836,6 +840,10 @@ int main(int argc, char *argv[])
        arg_list_t arg_list;
        job_list_t job_list;
 
+       setlocale(LC_ALL, "");
+       bindtextdomain("synfig", LOCALEDIR);
+       textdomain("synfig");
+
        progname=argv[0];
        Progress p(argv[0]);
 
@@ -958,7 +966,8 @@ int main(int argc, char *argv[])
                        if(target_name.empty() && !job_list.front().outfilename.empty())
                        {
                                VERBOSE_OUT(3)<<_("Target name undefined, attempting to figure it out")<<endl;
-                               string ext=job_list.front().outfilename.substr(job_list.front().outfilename.rfind('.')+1);
+                               string ext = filename_extension(job_list.front().outfilename);
+                               if (ext.length()) ext = ext.substr(1);
                                if(Target::ext_book().count(ext))
                                        target_name=Target::ext_book()[ext];
                                else
@@ -978,9 +987,7 @@ int main(int argc, char *argv[])
                        // given input filename. (ie: change the extension)
                        if(job_list.front().outfilename.empty())
                        {
-                               job_list.front().outfilename=job_list.front().filename;
-                               job_list.front().outfilename.erase(find(job_list.front().outfilename.begin(),job_list.front().outfilename.end(),'.'),job_list.front().outfilename.end());
-                               job_list.front().outfilename+='.';
+                               job_list.front().outfilename = filename_sans_extension(job_list.front().filename) + '.';
                                if(Target::book().count(target_name))
                                        job_list.front().outfilename+=Target::book()[target_name].second;
                                else
@@ -1051,7 +1058,7 @@ int main(int argc, char *argv[])
        if(!job_list.size())
        {
                cerr<<_("Nothing to do!")<<endl;
-               return SYNFIGTOOL_BORRED;
+               return SYNFIGTOOL_BORED;
        }
 
        for(;job_list.size();job_list.pop_front())