forked from quickshell/quickshell
		
	io/fileview: support zero-sized files (/proc)
This commit is contained in:
		
							parent
							
								
									0dd19d4a18
								
							
						
					
					
						commit
						60dfa67ec7
					
				
					 1 changed files with 27 additions and 11 deletions
				
			
		| 
						 | 
					@ -1,4 +1,5 @@
 | 
				
			||||||
#include "fileview.hpp"
 | 
					#include "fileview.hpp"
 | 
				
			||||||
 | 
					#include <array>
 | 
				
			||||||
#include <utility>
 | 
					#include <utility>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <qfileinfo.h>
 | 
					#include <qfileinfo.h>
 | 
				
			||||||
| 
						 | 
					@ -68,22 +69,37 @@ void FileViewReader::read(FileViewState& state, bool doStringConversion) {
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		auto& data = state.data;
 | 
							auto& data = state.data;
 | 
				
			||||||
		data = QByteArray(file.size(), Qt::Uninitialized);
 | 
							if (file.size() != 0) {
 | 
				
			||||||
 | 
								data = QByteArray(file.size(), Qt::Uninitialized);
 | 
				
			||||||
 | 
								qint64 i = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		qint64 i = 0;
 | 
								while (true) {
 | 
				
			||||||
 | 
									auto r = file.read(data.data() + i, data.length() - i); // NOLINT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		while (true) {
 | 
									if (r == -1) {
 | 
				
			||||||
			auto r = file.read(data.data() + i, data.length() - i); // NOLINT
 | 
										qCCritical(logFileView) << "Failed to read" << state.path;
 | 
				
			||||||
 | 
										goto error;
 | 
				
			||||||
 | 
									} else if (r == 0) {
 | 
				
			||||||
 | 
										data.resize(i);
 | 
				
			||||||
 | 
										break;
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			if (r == -1) {
 | 
									i += r;
 | 
				
			||||||
				qCCritical(logFileView) << "Failed to read" << state.path;
 | 
					 | 
				
			||||||
				goto error;
 | 
					 | 
				
			||||||
			} else if (r == 0) {
 | 
					 | 
				
			||||||
				data.resize(i);
 | 
					 | 
				
			||||||
				break;
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								auto buf = std::array<char, 4096>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			i += r;
 | 
								while (true) {
 | 
				
			||||||
 | 
									auto r = file.read(buf.data(), buf.size()); // NOLINT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									if (r == -1) {
 | 
				
			||||||
 | 
										qCCritical(logFileView) << "Failed to read" << state.path;
 | 
				
			||||||
 | 
										goto error;
 | 
				
			||||||
 | 
									} else {
 | 
				
			||||||
 | 
										data.append(buf.data(), r);
 | 
				
			||||||
 | 
										if (r == 0) break;
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (doStringConversion) {
 | 
							if (doStringConversion) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue