[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2004-04-29 21:15:02
Message-ID: 20040429211502.B954C9953 () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Use kfi_mkdir to create folder when installing a font -> perms will be set.


  M +6 -10     Main.cpp   1.9


--- kdebase/kcontrol/kfontinst/kfontinst/Main.cpp  #1.8:1.9
@@ -222,5 +222,6 @@ static int kfi_mkdir(const char *dir, bo
         kfi_sync_dirs();
 
-        chmod(dir, CMisc::DIR_PERMS);
+        if(!make)
+            ::chmod(dir, CMisc::DIR_PERMS);
         CGlobal::xcfg().addPath(ds);
 
@@ -282,22 +283,17 @@ static int kfi_cfgdir(const char *dir)
 static int kfi_install(const char *from, const char *to)
 {
-//    KInstance kinst("kfontinst");
     int       rv=-2;
         
-//    CGlobal::create(true, true);
-
     QString dir(CMisc::getDir(to));
 
     if(!CMisc::dExists(dir))
-        CMisc::createDir(dir);
+        kfi_mkdir(QFile::encodeName(dir));
 
     if(CMisc::doCmd("cp", "-f", from, to))
     {
-        chmod(to, CMisc::FILE_PERMS);
+        ::chmod(to, CMisc::FILE_PERMS);
         rv=0;
     }
 
-//    CGlobal::destroy();
-
     return rv;
 }


[prev in list] [next in list] [prev in thread] [next in thread]