OSSP CVS Repository

ossp - Check-in [2451]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 2451
Date: 2002-Aug-01 10:55:05 (local)
2002-Aug-01 08:55:05 (UTC)
User:ms
Branch:
Comment: Sqash double-slash pathname bug.
Tickets:
Inspections:
Files:
ossp-pkg/rc/rc_anal.c      1.8 -> 1.9     2 inserted, 1 deleted
ossp-pkg/rc/rc_test/rcfuncs      1.3 -> 1.4     3 inserted, 1 deleted

ossp-pkg/rc/rc_anal.c 1.8 -> 1.9

--- rc_anal.c    2002/06/28 17:43:23     1.8
+++ rc_anal.c    2002/08/01 08:55:05     1.9
@@ -130,7 +130,8 @@
         if (*(kszPathexpr + strlen(kszPathexpr)) != '/') {
             (*ppInst)->m_szLocs = malloc(strlen(kszPathexpr) + 2 * sizeof(char));
             strcpy((*ppInst)->m_szLocs, kszPathexpr);
-            strcat((*ppInst)->m_szLocs, "/");
+            if ((char)*((*ppInst)->m_szLocs + strlen((*ppInst)->m_szLocs) - 1) != '/')
+                strcat((*ppInst)->m_szLocs, "/");
         }
         else
             (*ppInst)->m_szLocs = strdup(kszPathexpr);


ossp-pkg/rc/rc_test/rcfuncs 1.3 -> 1.4

--- rcfuncs      2002/07/29 15:51:43     1.3
+++ rcfuncs      2002/08/01 08:55:05     1.4
@@ -1,7 +1,7 @@
 echo "**** Funcfile ist hier und wirds gemerged ****"
 echo "And again" >>disfile.txt
 cat disfile.txt | md5 >>disfile.txt
-uname -a
+uname -pn
 
 echo "Peter SMEJ ist chef Entwickler."
 echo "Thomas LOTTERER ist chef Entwickler."
@@ -9,3 +9,5 @@
 echo "Ralf ENGELSCHALL ist aber chef-chef Entwickler!"
 
 echo "**** Funcfile ist fertig, rc gehts weiter ****"
+echo
+

CVSTrac 2.0.1