Update

[chaz/tar] / src / transform.c

diff --git a/src/transform.c b/src/transform.c
index fd2ed51ec70401101b0120693e28974a9463e477..349a0d59e21c7394781a9d27b44c7df8f2a907ff 100644 (file)
--- a/src/transform.c
+++ b/src/transform.c
@@ -1,9 +1,9 @@
 /* This file is part of GNU tar. 
 /* This file is part of GNU tar. 

-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -498,21 +498,21 @@ _transform_name_to_obstack (char *input)
 }
   
 bool
 }
   
 bool

-transform_name_fp (char **pinput, char *(*fun)(char *))
+transform_name_fp (char **pinput, char *(*fun)(char *, void *), void *dat)

 {
     char *str;
     bool ret = _transform_name_to_obstack (*pinput);
     if (ret)
       {
        str = obstack_finish (&stk);
 {
     char *str;
     bool ret = _transform_name_to_obstack (*pinput);
     if (ret)
       {
        str = obstack_finish (&stk);

-       assign_string (pinput, fun ? fun (str) : str);
+       assign_string (pinput, fun ? fun (str, dat) : str);

        obstack_free (&stk, str);
       }
     else if (fun)
       {
        str = *pinput;
        *pinput = NULL;
        obstack_free (&stk, str);
       }
     else if (fun)
       {
        str = *pinput;
        *pinput = NULL;

-       assign_string (pinput, fun (str));
+       assign_string (pinput, fun (str, dat));

        free (str);
        ret = true;
       }
        free (str);
        ret = true;
       }


@@ -522,6 +522,6 @@ transform_name_fp (char **pinput, char *(*fun)(char *))
 bool
 transform_name (char **pinput)
 {
 bool
 transform_name (char **pinput)
 {

-  return transform_name_fp (pinput, NULL);
+  return transform_name_fp (pinput, NULL, NULL);

 }
 
 }