Merge remote-tracking branch 'sweil/for-anthony' into staging

* sweil/for-anthony:
  Fix some more license versions (GPL2+ instead of GPL2)
  dump: Fix license version (GPL2+ instead of GPL2)
  configure: Fix build for some versions of glibc (9pfs)
  monitor: Fix memory leak with readline completion
This commit is contained in:
Anthony Liguori 2012-06-18 10:18:26 -05:00
commit 49023ff78c
10 changed files with 23 additions and 16 deletions

4
configure vendored
View File

@ -2812,7 +2812,11 @@ fi
open_by_hande_at=no open_by_hande_at=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <fcntl.h> #include <fcntl.h>
#if !defined(AT_EMPTY_PATH)
# error missing definition
#else
int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); } int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); }
#endif
EOF EOF
if compile_prog "" "" ; then if compile_prog "" "" ; then
open_by_handle_at=yes open_by_handle_at=yes

View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

4
dump.c
View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

4
dump.h
View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

View File

@ -337,6 +337,9 @@ static void readline_completion(ReadLineState *rs)
} }
readline_show_prompt(rs); readline_show_prompt(rs);
} }
for (i = 0; i < rs->nb_completions; i++) {
g_free(rs->completions[i]);
}
} }
/* return true if command handled */ /* return true if command handled */

View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */

View File

@ -6,8 +6,8 @@
* Authors: * Authors:
* Wen Congyang <wency@cn.fujitsu.com> * Wen Congyang <wency@cn.fujitsu.com>
* *
* This work is licensed under the terms of the GNU GPL, version 2. See * This work is licensed under the terms of the GNU GPL, version 2 or later.
* the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
* *
*/ */