diff --git a/utils/ccc b/utils/ccc
index eff1843..f902313 100755
--- a/utils/ccc
+++ b/utils/ccc
@@ -22,6 +22,8 @@
     cmd = ' '.join(args)
     print >> sys.stderr, cmd
     code = os.system(cmd)
+    if code > 255:
+        code = 1
     if code:
         sys.exit(code)
 
@@ -41,7 +43,11 @@
     i = path.rfind('.')
     if i < 0:
         return path
-    return path[:i] + newext
+    j = path.rfind('/', 0, i)
+    print path
+    if j < 0:
+        return path[:i] + "." + newext
+    return path[j+1:i] + "." + newext
 
 def inferlanguage(extension):
     if extension == "c":