1 files changed, 48 insertions, 25 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 8ba1eb7..1a8f154 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -236,228 +236,251 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     else
         usingIcon = false;
         if (!usingIcon)
                         hide();
     recording = false;
 }
 
 VMemo::~VMemo() {
 }
 
 int VMemo::position()
 {
     return 1;
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
       if (recording) {
           fromToggle = true;
           stopRecording();
       }  else {
           fromToggle = true;
           startRecording();
       }
   }
 }
 
 void VMemo::paintEvent( QPaintEvent* ) {
   QPainter p(this);
   p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 
 void VMemo::mousePressEvent( QMouseEvent * /*me*/) {
 
                 if(!recording) {
                                 if(!startRecording() ){
                                                 QMessageBox::critical(0, "vmemo", "Abort Recording", "Abort Recording");
                                 }
                 }   else {
                                 stopRecording();
                 }
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * ) {
 }
 
 bool VMemo::startRecording() {
   Config config( "Vmemo" );
   config.setGroup( "System" );
 
 
   odebug << "Start recording engines" << oendl;
   recording = true;
 
   if (openDSP() == -1)  {
                         recording = false;
                         return false;
   }
 
   config.setGroup("Defaults");
 
   date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
   date.replace(QRegExp("'"),"");
   date.replace(QRegExp(" "),"_");
   date.replace(QRegExp(":"),"-");
   date.replace(QRegExp(","),"");
 
   QString fName;
   config.setGroup( "System" );
   fName = QPEApplication::documentDir() ;
   fileName = config.readEntry("RecLocation", fName);
 
   int s;
   s=fileName.find(':');
   if(s)
     fileName=fileName.right(fileName.length()-s-2);
   odebug << "pathname will be "+fileName << oendl;
 
   if( fileName.left(1).find('/') == -1)
     fileName="/"+fileName;
   if( fileName.right(1).find('/') == -1)
     fileName+="/";
   fName = "vm_"+ date + ".wav";
 
   fileName += fName;
   odebug << "filename is " + fileName << oendl;
 
   useAlerts = config.readBoolEntry("Alert",1);
   if(useAlerts) {
     msgLabel = new QLabel( 0, "alertLabel" );
     msgLabel->setText( tr("<B><P><font size=+2>VMemo-Recording</font></B><p>%1</p>").arg("vm_"+ date));
     msgLabel->show();
   }
         
-// open tmp file here
-  char *pointer;
-  pointer=tmpnam(NULL);
-  odebug << "Opening tmp file " << pointer << "" << oendl;
+  // open tmp file here
+  char *tmpFilePath = 0;
+  char *tmpDir = getenv("TMPDIR");
+  if (tmpDir && *tmpDir != '\0') {
+    tmpFilePath = new char[strlen(tmpDir) + strlen("/vmemo-wav-XXXXXX") + 1];
+    strcpy(tmpFilePath, tmpDir);
+    free(tmpDir);
+  } else {
+    tmpFilePath = new char[strlen("/tmp/vmemo-wav-XXXXXX") + 1];
+    strcpy(tmpFilePath, "/tmp");
+  }
+  strcat(tmpFilePath, "/vmemo-wav-XXXXXX");
+  mode_t currUmask = umask(S_IRWXO | S_IRWXG);
+  int tmpFd = mkstemp(tmpFilePath);
+  umask(currUmask);
+  if (tmpFd == -1) {
+    owarn << "Could not open temp file with template " << tmpFilePath
+          << oendl;
+    delete [] tmpFilePath;
+    return false;
+  } else
+    odebug << "Opened temp file " << tmpFilePath << "" << oendl;
+
+  close(tmpFd);
 
-  if(openWAV(pointer ) == -1)  {
+  if(openWAV(tmpFilePath ) == -1)  {
 
     QString err("Could not open the temp file\n");
     err += fileName;
     QMessageBox::critical(0, "vmemo", err, "Abort");
     ::close(dsp);
     return false;
   }
   if( record() ) {
 
-  QString cmd;
-  if( fileName.find(".wav",0,true) == -1)
-      fileName += ".wav";
+    if( fileName.find(".wav",0,true) == -1)
+        fileName += ".wav";
 
-  cmd.sprintf("mv %s "+fileName, pointer);
-// move tmp file to regular file here
-
-  system(cmd.latin1());
-
-  QArray<int> cats(1);
-  cats[0] = config.readNumEntry("Category", 0);
-
-  QString dlName("vm_");
-  dlName += date;
-  DocLnk l;
-  l.setFile(fileName);
-  l.setName(dlName);
-  l.setType("audio/x-wav");
-  l.setCategories(cats);
-  l.writeLink();
-  return true;
+    int retVal = rename(tmpFilePath, fileName.local8Bit());
+    if (retVal == -1) {
+        owarn << "Could not move " << tmpFilePath << " to " << fileName
+              << oendl;
+        delete [] tmpFilePath;
+        return false;
+    }
+    delete [] tmpFilePath;
+
+    QArray<int> cats(1);
+    cats[0] = config.readNumEntry("Category", 0);
+
+    QString dlName("vm_");
+    dlName += date;
+    DocLnk l;
+    l.setFile(fileName);
+    l.setName(dlName);
+    l.setType("audio/x-wav");
+    l.setCategories(cats);
+    l.writeLink();
+    return true;
   } else
       return false;
 
 }
 
 void VMemo::stopRecording() {
 //    show();
     odebug << "Stopped recording" << oendl;
     recording = false;
     if(useAlerts) {
         msgLabel->close();
         msgLabel=0;
         delete msgLabel;
     }
     t_timer->stop();
     Config cfg("Vmemo");
     cfg.setGroup("Defaults");
 //     if( cfg.readNumEntry("hideIcon",0) == 1 )
 //         hide();
 }
 
 int VMemo::openDSP() {
   Config cfg("Vmemo");
   cfg.setGroup("Record");
 
   speed = cfg.readNumEntry("SampleRate", 22050);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
   if (cfg.readNumEntry("SixteenBit", 1)==1)  {
     format = AFMT_S16_LE;
     resolution = 16;
   } else {
     format = AFMT_U8;
     resolution = 8;
   }
 
   odebug << "samplerate: " << speed << ", channels " << channels << ", resolution " << resolution << "" << oendl;
 
   if(systemZaurus) {
     dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1
     channels=1; //zaurus has one input channel
   }  else {
 #ifdef QT_QWS_DEVFS
     dsp = open("/dev/sound/dsp", O_RDONLY);
 #else
     dsp = open("/dev/dsp", O_RDONLY);
 #endif
   }
 
   if (dsp == -1)  {
       msgLabel->close();
       msgLabel=0;
       delete msgLabel;
 
       perror("open(\"/dev/dsp\")");
       errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
       QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
       return -1;
   }
 
   if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
 //    return -1;
   }
   if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
 //    return -1;
   }
   if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_SPEED\")");
 //    return -1;
   }
   if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
     perror("ioctl(\"SOUND_PCM_READ_RATE\")");
 //    return -1;
   }
 
   QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; //mute
 
   return 1;
 }
 
 int VMemo::openWAV(const char *filename) {
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
     errorMsg=filename;
     return -1;
   }
 
   wav=track.handle();
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
   useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
   WaveHeader wh;
 
   wh.main_chunk = RIFF;