added --ccache-skip option from andrew morton

diff --git a/ccache.1 b/ccache.1
index 24242391ae4c54055bec2ff679ef24980ec33576..47783f59bac4a0b64b368d3853193fc4d1ab6f57 100644 (file)
--- a/ccache.1
+++ b/ccache.1
@@ -215,9 +215,10 @@ the aCC compiler\&.
 .PP 
 .SH "CACHE SIZE MANAGEMENT" 
 .PP 
-By default ccache has no limit on the cache size\&. You can set a limit
-using the "ccache -M" and "ccache -F" options, which set the size and
-number of files limits\&.
+By default ccache has a one gigabyte limit on the cache size and no
+maximum number of files\&. You can set a different limit using the
+"ccache -M" and "ccache -F" options, which set the size and number of
+files limits\&.
 .PP 
 When these limits are reached ccache will reduce the cache to 20%
 below the numbers you specified in order to avoid doing the cache

diff --git a/ccache.c b/ccache.c
index d9c0fa9863d087721a2e252d07a4ad4faa140fcb..eda5556ac539dcaf351e46250bca7710689568a6 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -648,6 +648,16 @@ static void process_args(int argc, char **argv)
                        continue;
                }
 
+               /* The user knows best: just swallow the next arg */
+               if (strcmp(argv[i], "--ccache-skip") == 0) {
+                       i++;
+                       if (i == argc) {
+                               failed();
+                       }
+                       args_add(stripped_args, argv[i]);
+                       continue;
+               }
+
                /* options that take an argument */
                {
                        const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",

diff --git a/ccache.yo b/ccache.yo
index 3acb9106e0f40fb7adbe9aad94e162c7e96bafca..aaab022e8693fe7449b51af7f2a4e3018fbd0087 100644 (file)
--- a/ccache.yo
+++ b/ccache.yo
@@ -186,9 +186,10 @@ enddit()
 
 manpagesection(CACHE SIZE MANAGEMENT)
 
-By default ccache has no limit on the cache size. You can set a limit
-using the "ccache -M" and "ccache -F" options, which set the size and
-number of files limits.
+By default ccache has a one gigabyte limit on the cache size and no
+maximum number of files. You can set a different limit using the
+"ccache -M" and "ccache -F" options, which set the size and number of
+files limits.
 
 When these limits are reached ccache will reduce the cache to 20%
 below the numbers you specified in order to avoid doing the cache