Skip to content
Permalink
Browse files

Switch to modern realpath()

Assume everywhere that the realpath() implementation has the
POSIX.1-2008 behaviour, i.e. allowing NULL as second parameter and thus
returning a newly allocated buffer; it is not just a GNU extension,
and supported already by modern libc's on other OSes.

menu_canonicalize_file_name() is always called with FALSE as second
parameter, so it is replaced directly by realpath(); this allows the
complete removal of canonicalize.{c,h}.

This is a forward-port of the same changes done in gnome-menus, see:
https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/4
  • Loading branch information...
pinotree authored and raveit65 committed Dec 25, 2018
1 parent 96505c4 commit 82108808f13d056b3904c1717658a306a4aba2dd
Showing with 7 additions and 374 deletions.
  1. +0 −2 libmenu/Makefile.am
  2. +0 −330 libmenu/canonicalize.c
  3. +0 −34 libmenu/canonicalize.h
  4. +2 −2 libmenu/entry-directories.c
  5. +5 −5 libmenu/matemenu-tree.c
  6. +0 −1 libmenu/menu-layout.c
@@ -13,7 +13,6 @@ libmate_menu_include_HEADERS = \
matemenu-tree.h

libmate_menu_sources = \
canonicalize.c \
desktop-entries.c \
entry-directories.c \
matemenu-tree.c \
@@ -23,7 +22,6 @@ libmate_menu_sources = \

libmate_menu_la_SOURCES = \
$(libmate_menu_sources) \
canonicalize.h \
desktop-entries.h \
entry-directories.h \
matemenu-tree.h \

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 8210880

Please sign in to comment.
You can’t perform that action at this time.