path: root/lib/libalpm/conflict.c
AgeCommit message (Expand)AuthorFilesLines
2016-01-04Update copyright years for 2016Allan McRae1-1/+1
2015-12-05skip conflicts resolved by file replacementAndrew Gregory1-0/+15
2015-10-27Alpm, check for NULL in free-functionsRikard Falkeborn1-0/+2
2015-02-01Update copyright notices for 2015Allan McRae1-1/+1
2014-12-27Initialize memory to prevent issues when freeing on errorAllan McRae1-2/+2
2014-12-24conflict_new: free memory on errorAllan McRae1-2/+6
2014-12-24add_fileconflict: free memory on errorAllan McRae1-0/+1
2014-12-24_alpm_conflict_dup: fix memory leak on errorAllan McRae1-2/+6
2014-09-16fix improper FREELIST callsAndrew Gregory1-2/+6
2014-08-03move _alpm_lstat into util-commonAndrew Gregory1-1/+1
2014-02-04alpm: export *_free functionsAndrew Gregory1-3/+3
2014-01-28Remove ts and sw from vim modeline when noet is setFlorian Pritz1-1/+1
2014-01-06Update copyright years for 2014Allan McRae1-1/+1
2013-08-21conflict.c: fix directory ownership checkAndrew Gregory1-4/+12
2013-06-03improve dir->file transition conflict resolutionAndrew Gregory1-68/+65
2013-06-03conflict.c: check for file -> dir replacementsAndrew Gregory1-19/+20
2013-06-03conflict.c: exclude trailing slash from file pathAndrew Gregory1-6/+6
2013-06-03conflict.c: do not ignore symlink<->dir conflictsAndrew Gregory1-7/+0
2013-06-03alpm_filelist: remove resolved_pathAndrew Gregory1-13/+1
2013-05-04conflict.c: compare package pointers directlyAndrew Gregory1-3/+5
2013-02-24Perform limited conflict checking with --forceAllan McRae1-2/+26
2013-02-24use resolved_path for filelist_containsAndrew Gregory1-0/+5
2013-02-24return resolved paths from filelist_differenceAndrew Gregory1-22/+14
2013-02-24return resolved paths from filelist_intersectionAndrew Gregory1-2/+2
2013-02-24use alpm_list_free on filelist intersectionAndrew Gregory1-1/+1
2013-02-16find_fileconflicts: reduce path resolution callsAndrew Gregory1-4/+6
2013-01-28add doxygen comments to conflict.cAndrew Gregory1-14/+80
2013-01-04Fix open braces styleGerardo Exequiel Pozzi1-1/+2
2013-01-03Update copyright year for 2013Allan McRae1-1/+1
2012-12-14Avoid upgrade conflict with unchanged effective pathAllan McRae1-0/+1
2012-12-14Resolve file paths during inter-package conflict checkAllan McRae1-0/+5
2012-08-02Split _alpm_filelist_operation functionAllan McRae1-6/+6
2012-08-02Move filelist functions into separate source fileDan McGee1-86/+11
2012-08-01Merge branch 'maint'Dan McGee1-1/+8
2012-08-01lib/conflict: use a binary search within filelistsDave Reisner1-8/+5
2012-08-01Add more debug logging to dir_belongsto_pkg() functionDan McGee1-1/+8
2012-07-10Merge branch 'maint'Dan McGee1-6/+31
2012-07-10Check empty subdirectory ownershipAllan McRae1-0/+5
2012-07-10Add conflict for replacing owned empty directoryAllan McRae1-6/+26
2012-05-21fix -Wshadow warnings as reported by gcc 4.4.3Dave Reisner1-2/+2
2012-04-30Move short-lived realpath buffers to the stackDan McGee1-2/+1
2012-02-20Update copyright yearsAllan McRae1-1/+1
2011-12-22include config.h via MakefilesDave Reisner1-2/+0
2011-12-12Calculate root length only once when checking for file conflictsDan McGee1-3/+5
2011-12-12lib/conflict: save strlen call by reusing snprintf returnDave Reisner1-2/+3
2011-11-01Merge branch 'maint'Dan McGee1-14/+19
2011-10-27Fix issues with replacing unowned symlinksDan McGee1-14/+19
2011-10-14Make _alpm_filelist_contains() NULL-safeDan McGee1-3/+7
2011-09-27Ensure fileconflict value is actually a stringDan McGee1-16/+14
2011-09-03Former transaction callback rename refactorDan McGee1-2/+2